NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

busybox: convert to kconfig-package infrastructure

Browse Source 
This patch converts the busybox package to the new kconfig-package
infrastructure, thus removing code duplication and ensuring a consistent
behavior of kconfig packages.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas De Schampheleire 2014-08-03 17:32:43 +02:00 committed by Thomas Petazzoni
parent c8d8e8a536
commit a970021831
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
package/busybox/busybox.mk
View File

@ -45,6 +45,10 @@ ifndef BUSYBOX_CONFIG_FILE
BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
endif endif
BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
BUSYBOX_KCONFIG_OPT = $(BUSYBOX_MAKE_OPTS)
define BUSYBOX_PERMISSIONS define BUSYBOX_PERMISSIONS
/bin/busybox f 4755 0 0 - - - - - /bin/busybox f 4755 0 0 - - - - -
/usr/share/udhcpc/default.script f 755 0 0 - - - - - /usr/share/udhcpc/default.script f 755 0 0 - - - - -
@ -136,10 +140,6 @@ define BUSYBOX_NETKITTELNET
endef endef
endif endif
define BUSYBOX_COPY_CONFIG
$(INSTALL) -D -m 0644 $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_BUILD_CONFIG)
endef
# Disable shadow passwords support if unsupported by the C library # Disable shadow passwords support if unsupported by the C library
ifeq ($(BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS),) ifeq ($(BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS),)
define BUSYBOX_INTERNAL_SHADOW_PASSWORDS define BUSYBOX_INTERNAL_SHADOW_PASSWORDS
@ -190,8 +190,7 @@ define BUSYBOX_NOCLOBBER_INSTALL
$(SED) 's/^noclobber="0"$$/noclobber="1"/' $(@D)/applets/install.sh $(SED) 's/^noclobber="0"$$/noclobber="1"/' $(@D)/applets/install.sh
endef endef
define BUSYBOX_CONFIGURE_CMDS define BUSYBOX_KCONFIG_FIXUP_CMDS
$(BUSYBOX_COPY_CONFIG)
$(BUSYBOX_SET_MMU) $(BUSYBOX_SET_MMU)
$(BUSYBOX_SET_LARGEFILE) $(BUSYBOX_SET_LARGEFILE)
$(BUSYBOX_SET_IPV6) $(BUSYBOX_SET_IPV6)
@ -203,6 +202,9 @@ define BUSYBOX_CONFIGURE_CMDS
$(BUSYBOX_INTERNAL_SHADOW_PASSWORDS) $(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
$(BUSYBOX_SET_INIT) $(BUSYBOX_SET_INIT)
$(BUSYBOX_SET_WATCHDOG) $(BUSYBOX_SET_WATCHDOG)
endef
define BUSYBOX_CONFIGURE_CMDS
@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \ @yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
-C $(@D) oldconfig -C $(@D) oldconfig
$(BUSYBOX_NOCLOBBER_INSTALL) $(BUSYBOX_NOCLOBBER_INSTALL)
@ -224,13 +226,4 @@ define BUSYBOX_INSTALL_TARGET_CMDS
$(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)
endef endef
$(eval $(generic-package)) $(eval $(kconfig-package))
busybox-menuconfig busybox-xconfig busybox-gconfig: busybox-patch
$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(BUSYBOX_DIR) \
$(subst busybox-,,$@)
rm -f $(BUSYBOX_DIR)/.stamp_built
rm -f $(BUSYBOX_DIR)/.stamp_target_installed
busybox-update-config: busybox-configure
cp -f $(BUSYBOX_BUILD_CONFIG) $(BUSYBOX_CONFIG_FILE)