- musl dl suffix, linux-rebuild target

- busybox config removed print, init utils

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

3 files changed, 31 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index 4853315..4a8be38 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ MUSL_DL_BASENAME=musl
 MUSL_DL_VERSION=1.1.19
 MUSL_DL_SUFFIX=tar.gz
 MUSL_DL_URL=$(MUSL_DL_PREFIX)/$(MUSL_DL_BASENAME)-$(MUSL_DL_VERSION).$(MUSL_DL_SUFFIX)
-MUSL_DL_FILE=$(DL_DIR)/$(MUSL_DL_BASENAME)-$(MUSL_DL_VERSION)
+MUSL_DL_FILE=$(DL_DIR)/$(MUSL_DL_BASENAME)-$(MUSL_DL_VERSION).$(MUSL_DL_SUFFIX)
 MUSL_BUILD_DIR=$(BUILD_DIR)/$(MUSL_DL_BASENAME)-$(MUSL_DL_VERSION)
 MUSL_TARGET=$(MUSL_BUILD_DIR)/lib/libc.so
 
@@ -92,6 +92,10 @@ $(BUSYBOX_BUILD_DIR)/Makefile:
 
 extract: dl $(LINUX_BUILD_DIR)/Makefile $(MUSL_BUILD_DIR)/Makefile $(BUSYBOX_BUILD_DIR)/Makefile
 
+define DO_BUILD_LINUX
+	make -C '$(LINUX_BUILD_DIR)' -j$(BUILDJOBS) ARCH='$(ARCH)' bzImage
+endef
+
 $(LINUX_TARGET):
 	cp -v '$(CFG_DIR)/linux.config' '$(LINUX_BUILD_DIR)/.config'
 ifeq (x$(DEFCONFIG),x)
@@ -100,7 +104,7 @@ else
 	make -C '$(LINUX_BUILD_DIR)' x86_64_defconfig
 endif
 	make -C '$(LINUX_BUILD_DIR)' kvmconfig
-	make -C '$(LINUX_BUILD_DIR)' -j$(BUILDJOBS) ARCH='$(ARCH)' bzImage
+	$(DO_BUILD_LINUX)
 	make -C '$(LINUX_BUILD_DIR)' -j$(BUILDJOBS) ARCH='$(ARCH)' INSTALL_MOD_PATH='$(ROOTFS_DIR)/usr' modules
 	make -C '$(LINUX_BUILD_DIR)' -j$(BUILDJOBS) ARCH='$(ARCH)' INSTALL_MOD_PATH='$(ROOTFS_DIR)/usr' modules_install
 	make -C '$(LINUX_BUILD_DIR)' -j$(BUILDJOBS) ARCH='$(ARCH)' INSTALL_HDR_PATH='$(ROOTFS_DIR)/usr' headers_install
@@ -124,6 +128,9 @@ $(BUSYBOX_TARGET):
 	sed -i 's,^\(CONFIG_EXTRA_LDFLAGS[ ]*=\).*,\1"",g'    '$(BUSYBOX_BUILD_DIR)/.config'
 	sed -i 's,^\(CONFIG_PREFIX[ ]*=\).*,\1"./_install",g' '$(BUSYBOX_BUILD_DIR)/.config'
 
+build-linux: $(LINUX_TARGET)
+	$(DO_BUILD_LINUX)
+
 build: extract $(LINUX_TARGET) $(MUSL_TARGET) $(BUSYBOX_TARGET)
 
 $(INITRD_TARGET): $(ROOTFS_DIR)/bin/busybox
@@ -144,10 +151,6 @@ image-rebuild: force-remove
 	rm -rf '$(ROOTFS_DIR)'
 	$(DO_BUILD)
 
-image-reinstall:
-	rm -f '$(INITRD_TARGET)'
-	$(DO_BUILD)
-
 image-repack:
 	rm -f '$(INITRD_TARGET)'
 	$(DO_BUILD)
@@ -190,3 +193,5 @@ help:
 	$(call HELP_PREFIX,qemu-console,testing your kernel/initramfs combination with [n]curses QEMU)
 	$(call HELP_PREFIX,qemu-net,testing your kernel/initramfs combination with QEMU and network support through TAP)
 	@echo "\t\tAdditional options: NET_BRIDGE, NET_IP4, NET_HWADDR"
+
+.PHONY: all pre dl extract build build-linux image image-rebuild image-repack net qemu qemu-console qemu-serial qemu-serial-net qemu-net help
diff --git a/config/busybox.config b/config/busybox.config
index 356f128..1bc70e5 100644
--- a/config/busybox.config
+++ b/config/busybox.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.29.2
-# Tue Sep  4 15:00:12 2018
+# Tue Sep  4 17:04:01 2018
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -330,10 +330,10 @@ CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
+CONFIG_WHOAMI=y
 CONFIG_WHO=y
 CONFIG_W=y
 CONFIG_USERS=y
-CONFIG_WHOAMI=y
 CONFIG_YES=y
 
 #
@@ -482,9 +482,9 @@ CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y
 # CONFIG_HALT is not set
 CONFIG_POWEROFF=y
 CONFIG_REBOOT=y
-CONFIG_FEATURE_WAIT_FOR_INIT=y
-CONFIG_FEATURE_CALL_TELINIT=y
-CONFIG_TELINIT_PATH="/sbin/telinit"
+# CONFIG_FEATURE_WAIT_FOR_INIT is not set
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
 # CONFIG_INIT is not set
 # CONFIG_LINUXRC is not set
 # CONFIG_FEATURE_USE_INITTAB is not set
@@ -505,10 +505,10 @@ CONFIG_USE_BB_PWD_GRP=y
 CONFIG_USE_BB_SHADOW=y
 CONFIG_USE_BB_CRYPT=y
 CONFIG_USE_BB_CRYPT_SHA=y
-CONFIG_ADD_SHELL=y
-CONFIG_REMOVE_SHELL=y
 CONFIG_ADDGROUP=y
 CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_ADD_SHELL=y
+CONFIG_REMOVE_SHELL=y
 CONFIG_ADDUSER=y
 # CONFIG_FEATURE_CHECK_NAMES is not set
 CONFIG_LAST_ID=60000
@@ -759,10 +759,10 @@ CONFIG_FEATURE_DC_LIBM=y
 # CONFIG_FEATURE_DEVFS is not set
 CONFIG_DEVMEM=y
 CONFIG_FBSPLASH=y
+# CONFIG_FLASHCP is not set
 # CONFIG_FLASH_ERASEALL is not set
 # CONFIG_FLASH_LOCK is not set
 # CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASHCP is not set
 CONFIG_HDPARM=y
 CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
 CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
@@ -809,13 +809,13 @@ CONFIG_SETSERIAL=y
 CONFIG_STRINGS=y
 CONFIG_TIME=y
 CONFIG_TTYSIZE=y
+CONFIG_UBIRENAME=y
 CONFIG_UBIATTACH=y
 CONFIG_UBIDETACH=y
 CONFIG_UBIMKVOL=y
 CONFIG_UBIRMVOL=y
 CONFIG_UBIRSVOL=y
 CONFIG_UBIUPDATEVOL=y
-CONFIG_UBIRENAME=y
 CONFIG_VOLNAME=y
 CONFIG_WATCHDOG=y
 
@@ -988,20 +988,20 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
 #
 # Print Utilities
 #
-CONFIG_LPD=y
-CONFIG_LPR=y
-CONFIG_LPQ=y
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
 
 #
 # Mail Utilities
 #
-CONFIG_MAKEMIME=y
-CONFIG_POPMAILDIR=y
-CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
-CONFIG_REFORMIME=y
-CONFIG_FEATURE_REFORMIME_COMPAT=y
-CONFIG_SENDMAIL=y
-CONFIG_FEATURE_MIME_CHARSET="us-ascii"
+# CONFIG_MAKEMIME is not set
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+CONFIG_FEATURE_MIME_CHARSET=""
 
 #
 # Process Utilities
diff --git a/skeleton/init b/skeleton/init
index d82b175..e5c079b 100755
--- a/skeleton/init
+++ b/skeleton/init
@@ -49,7 +49,7 @@ for arg in $(cat /proc/cmdline | tr '[:upper:]' '[:lower:]'); do
         for netif in $(ls /sys/class/net); do
             ifconfig ${netif} 0.0.0.0 up
         done
-        $(command -v udhcpc) -R -H ${HOSTNAME} ${UDHCPC_ARGS}
+        $(command -v udhcpc) -R -x hostname:${HOSTNAME} ${UDHCPC_ARGS}
     fi
 done