@@ -226,7 +226,6 @@ endif # BR2_TARGET_GENERIC_GETTY
BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_SET_GETTY
BUSYBOX_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB
-BUSYBOX_TARGET_FINALIZE_HOOKS += SYSTEM_UPDATE_SWAPON_SWAPOFF_INITTAB
endif # BR2_INIT_BUSYBOX
@@ -45,6 +45,5 @@ endif # BR2_TARGET_GENERIC_GETTY
SYSVINIT_TARGET_FINALIZE_HOOKS += SYSVINIT_SET_GETTY
SYSVINIT_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB
-SYSVINIT_TARGET_FINALIZE_HOOKS += SYSTEM_UPDATE_SWAPON_SWAPOFF_INITTAB
$(eval $(generic-package))
@@ -96,19 +96,6 @@ define SYSTEM_REMOUNT_ROOT_INITTAB
endef
endif
-define SYSTEM_UPDATE_SWAPON_SWAPOFF_INITTAB
- if [ -x $(TARGET_DIR)/sbin/swapon ]; then \
- $(SED) '\%:/sbin/swapon%s/^#*//' $(TARGET_DIR)/etc/inittab ; \
- else \
- $(SED) '\%:/sbin/swapon%s/^#*/#/' $(TARGET_DIR)/etc/inittab ; \
- fi
- if [ -x $(TARGET_DIR)/sbin/swapoff ]; then \
- $(SED) '\%:/sbin/swapoff%s/^#*//' $(TARGET_DIR)/etc/inittab ; \
- else \
- $(SED) '\%:/sbin/swapoff%s/^#*/#/' $(TARGET_DIR)/etc/inittab ; \
- fi
-endef
-
ifeq ($(BR_BUILDING)$(BR2_SYSTEM_DEFAULT_PATH),y"")
$(error BR2_SYSTEM_DEFAULT_PATH can't be empty)
endif
From: Carlos Santos <unixmania@gmail.com> This reverts commit c4dce0ae0f5d5d7fecb6f493e974e131a6df43da. A different fix will be provided in a forthcoming patch. --- CC: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> CC: Peter Korsgaard <peter@korsgaard.com> --- package/busybox/busybox.mk | 1 - package/sysvinit/sysvinit.mk | 1 - system/system.mk | 13 ------------- 3 files changed, 15 deletions(-)