From: Milton Miller <miltonm@bga.com>
To: linuxppc-dev@ozlabs.org
Cc: Paul Mackerras <paulus@samba.org>,
David Gibson <david@gibson.dropbear.id.au>
Subject: Re: Patch: [PATCH 3/4] bootwrapper: no gzip fixes
Date: Wed, 28 Mar 2007 02:21:04 -0600 (CST) [thread overview]
Message-ID: <boot-3-03.miltonm@bga.com> (raw)
In-Reply-To: <boot-3-00.miltonm@bga.com>
commit a9903811bf8d130a26004f9cb27b66513a267908 missed two uses of the
the .gz suffix in the wrapper script and didn't clean the additonal
possibly cached files.
Signed-off-by: Milton Miller <miltonm@bga.com>
Index: kernel/arch/powerpc/boot/wrapper
===================================================================
--- kernel.orig/arch/powerpc/boot/wrapper 2007-03-28 01:09:04.000000000 -0500
+++ kernel/arch/powerpc/boot/wrapper 2007-03-28 01:10:26.000000000 -0500
@@ -144,7 +144,7 @@ miboot|uboot)
esac
vmz="$tmpdir/`basename \"$kernel\"`.$ext"
-if [ -z "$cacheit" -o ! -f "$vmz.gz" -o "$vmz.gz" -ot "$kernel" ]; then
+if [ -z "$cacheit" -o ! -f "$vmz$gzip" -o "$vmz$gzip" -ot "$kernel" ]; then
${CROSS}objcopy $objflags "$kernel" "$vmz.$$"
if [ -n "$gzip" ]; then
Index: kernel/arch/powerpc/boot/Makefile
===================================================================
--- kernel.orig/arch/powerpc/boot/Makefile 2007-03-28 01:09:05.000000000 -0500
+++ kernel/arch/powerpc/boot/Makefile 2007-03-28 01:23:20.000000000 -0500
@@ -170,5 +170,11 @@ $(obj)/zImage.initrd: $(addprefix $(obj)
install: $(CONFIGURE) $(image-y)
sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<
-clean-files += $(addprefix $(objtree)/, vmlinux.strip.gz vmlinux.bin.gz)
+# anything not in $(targets)
clean-files += $(image-) $(initrd-) zImage zImage.initrd
+
+# clean up files cached by wrapper
+clean-kernel := vmlinux.strip vmlinux.bin
+clean-kernel += $(addsuffix .gz,$(clean-kernel))
+# If not absolute clean-files are relative to $(obj).
+clean-files += $(addprefix $(objtree)/, $(clean-kernel))
next prev parent reply other threads:[~2007-03-28 8:21 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-28 8:21 [PATCH 0/4] boot: cleanup and prep for more platforms Milton Miller
2007-03-28 8:21 ` [RFC] bootwrapper: allow vmlinuz to be an external payload Milton Miller
2007-03-28 8:21 ` [PATCH 2/4] bootwrapper: remove unused variable Milton Miller
2007-03-28 8:34 ` David Gibson
2007-03-28 16:04 ` Milton Miller
2007-03-28 8:21 ` Milton Miller [this message]
2007-03-28 20:03 ` Patch: [PATCH 3/4] bootwrapper: no gzip fixes Scott Wood
2007-03-28 8:21 ` [PATCH 4/4] bootwrapper: decompress less, check more Milton Miller
2007-03-29 13:31 ` Milton Miller
-- strict thread matches above, loose matches on Subject: below --
2007-03-19 20:55 [PATCH 0/7] boot: cleanup and prep for more platforms Milton Miller
2007-03-19 20:58 ` [PATCH 4/7] bootwrapper: add a fatal error helper Milton Miller
2007-03-20 0:38 ` David Gibson
2007-03-20 13:38 ` Milton Miller
2007-03-21 0:01 ` David Gibson
2007-03-19 20:58 ` [PATCH 3/7] boot: use FORCE Milton Miller
2007-03-20 15:52 ` Segher Boessenkool
2007-03-19 20:58 ` [PATCH 2/7] boot: rebuild when wrapper changes Milton Miller
2007-03-20 0:36 ` David Gibson
2007-03-20 15:50 ` Segher Boessenkool
2007-03-19 20:58 ` [PATCH 5/7] bootwrapper: missing relocation in crt0.S Milton Miller
2007-03-20 0:39 ` David Gibson
2007-03-20 20:09 ` Mark A. Greer
2007-03-19 20:58 ` [PATCH 6/7] bootwrapper: allow platforms to call library zImage_start Milton Miller
2007-03-20 4:55 ` David Gibson
2007-03-19 20:58 ` [PATCH 7/7] boot: export flush_cache Milton Miller
2007-03-20 4:55 ` David Gibson
2007-03-19 20:58 ` [PATCH 1/7] boot: use a common zImage rule Milton Miller
2007-03-20 3:30 ` David Gibson
2007-03-20 13:47 ` Milton Miller
2007-03-20 17:41 ` Mark A. Greer
2007-03-21 2:46 ` David Gibson
2007-03-21 15:02 ` [PATCH 0/8] boot: cleanup and prep for more platforms Milton Miller
2007-03-21 15:02 ` [PATCH 6/8] boot: use FORCE Milton Miller
2007-03-21 15:02 ` [PATCH 1/8] bootwrapper: add a fatal error helper Milton Miller
2007-03-21 15:02 ` [PATCH 5/8] boot: rebuild when wrapper changes Milton Miller
2007-03-21 15:02 ` [PATCH 3/8] bootwrapper: allow platforms to call library zImage_start Milton Miller
2007-03-21 15:02 ` [PATCH 2/8] bootwrapper: missing relocation in crt0.S Milton Miller
2007-03-23 5:25 ` Paul Mackerras
2007-03-28 8:21 ` [PATCH 1/4] " Milton Miller
2007-03-21 15:03 ` [PATCH 4/8] boot: export flush_cache Milton Miller
2007-03-21 15:03 ` [PATCH 7/8] boot: clean rule fixes Milton Miller
2007-03-21 15:03 ` [PATCH 8/8] boot: use a common zImage rule Milton Miller
2007-03-22 3:46 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=boot-3-03.miltonm@bga.com \
--to=miltonm@bga.com \
--cc=david@gibson.dropbear.id.au \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).