aboriginal

changeset 1318:a44deb7b4ee0 1.0.1

Busybox 1.18.0 doesn't build on Ubuntu 9.04. This fixes it.
author Rob Landley <rob@landley.net>
date Wed, 08 Dec 2010 02:42:07 -0600
parents b8b7d9c9c9c0
children 272e1a36e556
files sources/patches/busybox-1.18.0-buildsys.patch
diffstat 1 files changed, 48 insertions(+), 0 deletions(-) [+]
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/sources/patches/busybox-1.18.0-buildsys.patch	Wed Dec 08 02:42:07 2010 -0600
     1.3 @@ -0,0 +1,51 @@
     1.4 +diff -urpN busybox-1.18.0/Config.in busybox-1.18.0-buildsys/Config.in
     1.5 +--- busybox-1.18.0/Config.in	2010-11-22 21:43:21.000000000 +0100
     1.6 ++++ busybox-1.18.0-buildsys/Config.in	2010-12-05 23:14:04.173614427 +0100
     1.7 +@@ -128,8 +128,9 @@ config INSTALL_NO_USR
     1.8 + 	default n
     1.9 + 	depends on FEATURE_INSTALLER
    1.10 + 	help
    1.11 +-	  Disable use of /usr. busybox --install will install applets
    1.12 +-	  only to /bin and /sbin, never to /usr/bin or /usr/sbin.
    1.13 ++	  Disable use of /usr. busybox --install and "make install"
    1.14 ++	  will install applets only to /bin and /sbin,
    1.15 ++	  never to /usr/bin or /usr/sbin.
    1.16 + 
    1.17 + config LOCALE_SUPPORT
    1.18 + 	bool "Enable locale support (system needs locale for this to work)"
    1.19 +diff -urpN busybox-1.18.0/include/applets.src.h busybox-1.18.0-buildsys/include/applets.src.h
    1.20 +--- busybox-1.18.0/include/applets.src.h	2010-11-22 21:43:22.000000000 +0100
    1.21 ++++ busybox-1.18.0-buildsys/include/applets.src.h	2010-12-05 23:14:04.174614202 +0100
    1.22 +@@ -56,6 +56,11 @@ s     - suid type:
    1.23 + # define APPLET_NOFORK(name,main,l,s,name2)  { #name, #main, l, s, 1, 1 },
    1.24 + #endif
    1.25 + 
    1.26 ++#if ENABLE_INSTALL_NO_USR
    1.27 ++# define _BB_DIR_USR_BIN _BB_DIR_BIN
    1.28 ++# define _BB_DIR_USR_SBIN _BB_DIR_SBIN
    1.29 ++#endif
    1.30 ++
    1.31 + 
    1.32 + INSERT
    1.33 + IF_TEST(APPLET_NOFORK([,  test, _BB_DIR_USR_BIN, _BB_SUID_DROP, test))
    1.34 +diff -urpN busybox-1.18.0/scripts/gen_build_files.sh busybox-1.18.0-buildsys/scripts/gen_build_files.sh
    1.35 +--- busybox-1.18.0/scripts/gen_build_files.sh	2010-11-22 21:43:22.000000000 +0100
    1.36 ++++ busybox-1.18.0-buildsys/scripts/gen_build_files.sh	2010-11-24 14:59:47.732712663 +0100
    1.37 +@@ -18,14 +18,14 @@ generate()
    1.38 + 	local src="$1" dst="$2" header="$3" insert="$4"
    1.39 + 	#chk "${dst}"
    1.40 + 	(
    1.41 +-		echo "${header}"
    1.42 ++		printf "%s\n" "${header}"
    1.43 + 		if grep -qs '^INSERT$' "${src}"; then
    1.44 + 			sed -n '1,/^INSERT$/p' "${src}"
    1.45 +-			echo "${insert}"
    1.46 ++			printf "%s\n" "${insert}"
    1.47 + 			sed -n '/^INSERT$/,$p' "${src}"
    1.48 + 		else
    1.49 + 			if [ -n "${insert}" ]; then
    1.50 +-				echo "ERROR: INSERT line missing in: ${src}" 1>&2
    1.51 ++				printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
    1.52 + 			fi
    1.53 + 			cat "${src}"
    1.54 + 		fi