]>
Commit | Line | Data |
---|---|---|
bf1f4257 AM |
1 | diff -urpN busybox-1.18.0/Config.in busybox-1.18.0-buildsys/Config.in |
2 | --- busybox-1.18.0/Config.in 2010-11-22 21:43:21.000000000 +0100 | |
3 | +++ busybox-1.18.0-buildsys/Config.in 2010-12-05 23:14:04.173614427 +0100 | |
4 | @@ -128,8 +128,9 @@ config INSTALL_NO_USR | |
5 | default n | |
6 | depends on FEATURE_INSTALLER | |
7 | help | |
8 | - Disable use of /usr. busybox --install will install applets | |
9 | - only to /bin and /sbin, never to /usr/bin or /usr/sbin. | |
10 | + Disable use of /usr. busybox --install and "make install" | |
11 | + will install applets only to /bin and /sbin, | |
12 | + never to /usr/bin or /usr/sbin. | |
13 | ||
14 | config LOCALE_SUPPORT | |
15 | bool "Enable locale support (system needs locale for this to work)" | |
16 | diff -urpN busybox-1.18.0/include/applets.src.h busybox-1.18.0-buildsys/include/applets.src.h | |
17 | --- busybox-1.18.0/include/applets.src.h 2010-11-22 21:43:22.000000000 +0100 | |
18 | +++ busybox-1.18.0-buildsys/include/applets.src.h 2010-12-05 23:14:04.174614202 +0100 | |
19 | @@ -56,6 +56,11 @@ s - suid type: | |
20 | # define APPLET_NOFORK(name,main,l,s,name2) { #name, #main, l, s, 1, 1 }, | |
21 | #endif | |
22 | ||
23 | +#if ENABLE_INSTALL_NO_USR | |
24 | +# define _BB_DIR_USR_BIN _BB_DIR_BIN | |
25 | +# define _BB_DIR_USR_SBIN _BB_DIR_SBIN | |
26 | +#endif | |
27 | + | |
28 | ||
29 | INSERT | |
30 | IF_TEST(APPLET_NOFORK([, test, _BB_DIR_USR_BIN, _BB_SUID_DROP, test)) | |
31 | diff -urpN busybox-1.18.0/scripts/gen_build_files.sh busybox-1.18.0-buildsys/scripts/gen_build_files.sh | |
32 | --- busybox-1.18.0/scripts/gen_build_files.sh 2010-11-22 21:43:22.000000000 +0100 | |
33 | +++ busybox-1.18.0-buildsys/scripts/gen_build_files.sh 2010-11-24 14:59:47.732712663 +0100 | |
34 | @@ -18,14 +18,14 @@ generate() | |
35 | local src="$1" dst="$2" header="$3" insert="$4" | |
36 | #chk "${dst}" | |
37 | ( | |
38 | - echo "${header}" | |
39 | + printf "%s\n" "${header}" | |
40 | if grep -qs '^INSERT$' "${src}"; then | |
41 | sed -n '1,/^INSERT$/p' "${src}" | |
42 | - echo "${insert}" | |
43 | + printf "%s\n" "${insert}" | |
44 | sed -n '/^INSERT$/,$p' "${src}" | |
45 | else | |
46 | if [ -n "${insert}" ]; then | |
47 | - echo "ERROR: INSERT line missing in: ${src}" 1>&2 | |
48 | + printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2 | |
49 | fi | |
50 | cat "${src}" | |
51 | fi |