Author: arekm Date: Wed Oct 19 16:04:25 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; fix build with external printf (like on mksh)
---- Files affected: packages/busybox: busybox.spec (1.193 -> 1.194) , busybox-git.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/busybox/busybox.spec diff -u packages/busybox/busybox.spec:1.193 packages/busybox/busybox.spec:1.194 --- packages/busybox/busybox.spec:1.193 Tue Oct 18 18:41:00 2011 +++ packages/busybox/busybox.spec Wed Oct 19 18:04:20 2011 @@ -39,7 +39,7 @@ Name: busybox # stable line only Version: 1.19.2 -Release: 1 +Release: 2 License: GPL v2 Group: Applications Source0: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2 @@ -55,6 +55,7 @@ Patch105: busybox-1.19.2-syslogd.patch Patch106: busybox-1.19.2-tail.patch Patch107: busybox-1.19.2-tftp.patch +Patch0: %{name}-git.patch Patch1: %{name}-logconsole.patch Patch2: %{name}-printf-gettext.patch Patch3: %{name}-loadfont.patch @@ -169,6 +170,7 @@ %patch105 -p1 %patch106 -p1 %patch107 -p1 +%patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -315,6 +317,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.194 2011/10/19 16:04:20 arekm +- rel 2; fix build with external printf (like on mksh) + Revision 1.193 2011/10/18 16:41:00 arekm - revert, not fully working ================================================================ Index: packages/busybox/busybox-git.patch diff -u /dev/null packages/busybox/busybox-git.patch:1.1 --- /dev/null Wed Oct 19 18:04:25 2011 +++ packages/busybox/busybox-git.patch Wed Oct 19 18:04:20 2011 @@ -0,0 +1,112 @@ +commit efd08bfa0adab3ae299be7abdd45161a15804a3b +Author: Denys Vlasenko <[email protected]> +Date: Wed Oct 19 17:54:42 2011 +0200 + + gen_build_files: don't pass 200k+ strings as params. Closes 4321 + + Also removes one grep per generated file. + + Signed-off-by: Denys Vlasenko <[email protected]> + +diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh +index e518a90..1a3d3e9 100755 +--- a/scripts/gen_build_files.sh ++++ b/scripts/gen_build_files.sh +@@ -19,25 +19,20 @@ chk() { status "CHK" "$@"; } + + generate() + { +- local src="$1" dst="$2" header="$3" insert="$4" ++ # NB: data to be inserted at INSERT line is coming on stdin ++ local src="$1" dst="$2" header="$3" + #chk "${dst}" +- ( ++ { + # Need to use printf: different shells have inconsistent +- # rules re handling of "\n" in echo params, +- # and ${insert} definitely contains "\n". +- # Therefore, echo "${header}" would not work: ++ # rules re handling of "\n" in echo params. + printf "%s\n" "${header}" +- if grep -qs '^INSERT$' "${src}"; then +- sed -n '1,/^INSERT$/p' "${src}" +- printf "%s\n" "${insert}" +- sed -n '/^INSERT$/,$p' "${src}" +- else +- if [ -n "${insert}" ]; then +- printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2 +- fi +- cat "${src}" +- fi +- ) | sed '/^INSERT$/d' > "${dst}.tmp" ++ # print everything up to INSERT line ++ sed -n '/^INSERT$/q;1,/^INSERT$/p' "${src}" ++ # copy stdin to stdout ++ cat ++ # print everything after INSERT line ++ sed -n '/^INSERT$/{:l;n;p;bl}' "${src}" ++ } >"${dst}.tmp" + if ! cmp -s "${dst}" "${dst}.tmp"; then + gen "${dst}" + mv "${dst}.tmp" "${dst}" +@@ -47,24 +42,21 @@ generate() + } + + # (Re)generate include/applets.h +-s=`sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c` +-generate \ ++sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \ ++| generate \ + "$srctree/include/applets.src.h" \ + "include/applets.h" \ +- "/* DO NOT EDIT. This file is generated from applets.src.h */" \ +- "${s}" ++ "/* DO NOT EDIT. This file is generated from applets.src.h */" + + # (Re)generate include/usage.h + # We add line continuation backslash after each line, + # and insert empty line before each line which doesn't start + # with space or tab +-# (note: we need to use \\\\ because of ``) +-s=`sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\\\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\\\@p' "$srctree"/*/*.c "$srctree"/*/*/*.c` +-generate \ ++sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \ ++| generate \ + "$srctree/include/usage.src.h" \ + "include/usage.h" \ +- "/* DO NOT EDIT. This file is generated from usage.src.h */" \ +- "${s}" ++ "/* DO NOT EDIT. This file is generated from usage.src.h */" + + # (Re)generate */Kbuild and */Config.in + { cd -- "$srctree" && find . -type d; } | while read -r d; do +@@ -75,11 +67,10 @@ generate \ + if test -f "$src"; then + mkdir -p -- "$d" 2>/dev/null + +- s=`sed -n 's@^//kbuild:@@p' "$srctree/$d"/*.c` +- generate \ ++ sed -n 's@^//kbuild:@@p' "$srctree/$d"/*.c \ ++ | generate \ + "${src}" "${dst}" \ +- "# DO NOT EDIT. This file is generated from Kbuild.src" \ +- "${s}" ++ "# DO NOT EDIT. This file is generated from Kbuild.src" + fi + + src="$srctree/$d/Config.src" +@@ -87,11 +78,10 @@ generate \ + if test -f "$src"; then + mkdir -p -- "$d" 2>/dev/null + +- s=`sed -n 's@^//config:@@p' "$srctree/$d"/*.c` +- generate \ ++ sed -n 's@^//config:@@p' "$srctree/$d"/*.c \ ++ | generate \ + "${src}" "${dst}" \ +- "# DO NOT EDIT. This file is generated from Config.src" \ +- "${s}" ++ "# DO NOT EDIT. This file is generated from Config.src" + fi + done + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/busybox/busybox.spec?r1=1.193&r2=1.194&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
