Changeset 3876

Timestamp:

09/17/09 15:44:58 (2 years ago)

Author:

tg

Message:

It has been confirmed that GNU bash 4 fails to configure a brcm-2.4
kernel, due to the Linux people making use of GNU bash 2/3 features
no longer supported in GNU bash 4… but, apparently, in mksh. See my
eMail signature on the thread in freewrt-developers@ for more fun…

This commit possibly (untested) fixes this by forcing the user (for
1.0-stable) to install mksh (himself) unless GNU bash 2/3 are used;
in trunk we always build mksh already anyway. Then, the kernel make
is passed CONFIG_SHELL as an override to ${MBSH}, which already was
used a lot in trunk (points to mksh if it exists, GNU bash otherwi-
se) and is now new in 1.0-stable – assuming this is the fix.

Proper fix ought to be to change the Linux scripts to not depend on
non-POSIX features for shells called as /bin/sh (which probably has
been done in later 2.6.x revisions), but this is very intrusive.

I know Han Boetes had pointed this out *long* ago (similar bug was,
probably still is, found in glibc’s ldd; eglibc might have at least
fixed this one). Now the GNU folks bite back themselves…

Files:

• branches/freewrt_1_0/Makefile (modified) (1 diff)
• branches/freewrt_1_0/scripts/scan-tools.sh (modified) (2 diffs)
• branches/freewrt_1_0/target/linux/brcm-2.4/Makefile (modified) (6 diffs)
• branches/freewrt_1_0/toolchain/kernel-headers/Makefile (modified) (1 diff)
• trunk/freewrt/mk/kernel-build.mk (modified) (4 diffs)
• trunk/freewrt/toolchain/kernel-headers/Makefile (modified) (1 diff)

branches/freewrt_1_0/Makefile

@@ -150 +150 @@
-        @echo 'LC_ALL:=C' >>lbin/prereq.mk
-        @echo 'MAKE:=$${GMAKE}' >>lbin/prereq.mk
+        @if lbin/which mksh >/dev/null 2>&1; then \
+                echo "MBSH:=$$(lbin/which mksh)" >>lbin/prereq.mk; \
+        else \
+                echo "MBSH:=$$(lbin/which bash)" >>lbin/prereq.mk; \
+        fi
-        @echo "OStype:=$$(env NOFAKE=yes uname)" >>lbin/prereq.mk
-        @echo "_PATH:=$$PATH" >>lbin/prereq.mk

branches/freewrt_1_0/scripts/scan-tools.sh

@@ -2 +2 @@
-# $FreeWRT: src/share/misc/licence.template,v 1.8 2006/06/16 23:03:39 tg Rel $
-#-
-
+, 2009
-#       Thorsten Glaser <tg@mirbsd.de>
-#
@@ -223 +223 @@
-fi
-
+[[ ${BASH_VERSION%%.*} -lt 2 || ${BASH_VERSION%%.*} -gt 3 ]] && \
+    if ! which mksh >/dev/null 2>&1; then
+        echo 'Your GNU bash is either too old or too new; version'
+        echo '2 or 3 are required. Install mksh to continue. You'
+        echo 'can get it from http://mirbsd.de/mksh if it is not'
+        echo 'already included with your distribution.'
+        out=1
+fi
+
-
-cd $topdir

branches/freewrt_1_0/target/linux/brcm-2.4/Makefile

@@ -182 +182 @@
-          $(LINUX_DIR)/Makefile  \
-          $(LINUX_DIR)/arch/*/Makefile
-
-
+CONFIG_SHELL='${MBSH}' 
+CONFIG_SHELL='${MBSH}' 
-        touch $@
-else
-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-        @$(TRACE) target/linux/$(BOARD)-$(KERNEL)-kernel-configure
-
+CONFIG_SHELL='${MBSH}' 
-        touch $@
-endif
@@ -194 +194 @@
-$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.configured
-        @$(TRACE) target/linux/$(BOARD)-$(KERNEL)-kernel-compile
-
+CONFIG_SHELL='${MBSH}' 
-
-$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
@@ -203 +203 @@
-$(LINUX_DIR)/.modules-compile:
-        @$(TRACE) target/linux/$(BOARD)-$(KERNEL)-modules-compile
-
+CONFIG_SHELL='${MBSH}' 
-        touch $@
-
@@ -209 +209 @@
-        @$(TRACE) target/linux/$(BOARD)-$(KERNEL)-modules-install
-        rm -rf $(LINUX_BUILD_DIR)/modules
-
+CONFIG_SHELL='${MBSH}' 
-        touch $@
-
-$(LINUX_DIR)/.linux-compile: $(LINUX_KERNEL) $(LINUX_DIR)/.modules-install
-        @$(TRACE) target/linux/$(BOARD)-$(KERNEL)-create-packages
-
+CONFIG_SHELL='${MBSH}' 
-        touch $@
-
@@ -231 +231 @@
-
-install: compile
-
+CONFIG_SHELL='${MBSH}' 
-        @$(TRACE) target/linux/$(BOARD)-$(KERNEL)-modules-install
-        @rm -rf $(LINUX_BUILD_DIR)/root*
@@ -244 +244 @@
-        rm -rf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)
-        rm -f $(TARGETS)
-
+CONFIG_SHELL='${MBSH}' 
-
-clean:

branches/freewrt_1_0/toolchain/kernel-headers/Makefile

@@ -43 +43 @@
-$(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.unpacked
-        -$(CP) ./files/config.$(LINUX_HEADERS_ARCH) $(LINUX_HEADERS_DIR)/.config
-
+CONFIG_SHELL='${MBSH}' 
-        touch $(LINUX_HEADERS_DIR)/.configured
-

trunk/freewrt/mk/kernel-build.mk

@@ -60 +60 @@
-          $(LINUX_DIR)/Makefile  \
-          $(LINUX_DIR)/arch/*/Makefile
-
-
+CONFIG_SHELL='${MBSH}' 
+CONFIG_SHELL='${MBSH}' 
-else
-
-
+CONFIG_SHELL='${MBSH}' 
+CONFIG_SHELL='${MBSH}' 
-endif
-        touch -c $(LINUX_DIR)/.config
@@ -70 +70 @@
-$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config
-        $(TRACE) target/linux/$(BOARD)-$(KERNEL)-kernel-compile
-
+CONFIG_SHELL='${MBSH}' 
-        $(TRACE) target/linux/$(BOARD)-$(KERNEL)-modules-compile
-
+CONFIG_SHELL='${MBSH}' 
-        $(TRACE) target/linux/$(BOARD)-$(KERNEL)-modules-install
-        rm -rf $(LINUX_BUILD_DIR)/modules
-
+CONFIG_SHELL='${MBSH}' 
-        $(TRACE) target/linux/$(BOARD)-$(KERNEL)-create-packages
-        -mkdir $(BUILD_DIR)/kmod-control
-
+CONFIG_SHELL='${MBSH}' 
-        touch -c $(LINUX_DIR)/vmlinux
-
@@ -117 +117 @@
-
-install: compile
-
+CONFIG_SHELL='${MBSH}' 
-        $(TRACE) target/linux/$(BOARD)-$(KERNEL)-modules-install
-        rm -rf ${LINUX_BUILD_DIR}/root*
@@ -129 +129 @@
-
-noinstall: compile
-
+CONFIG_SHELL='${MBSH}' 
-        rm -rf ${LINUX_BUILD_DIR}/root*
-        cd ${BUILD_DIR} && mirpax -rw -pe root ${LINUX_BUILD_DIR}/

trunk/freewrt/toolchain/kernel-headers/Makefile

@@ -45 +45 @@
-$(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.unpacked
-        -$(CP) ./files/config.$(LINUX_HEADERS_ARCH) $(LINUX_HEADERS_DIR)/.config
-
+CONFIG_SHELL='${MBSH}' 
-        touch $(LINUX_HEADERS_DIR)/.configured
-