search for: gen_initramfs_list

Hi hpa. This change is obviously valid for your integrated kernel-klibc tree. But it may result in some manual merge. Just a FYI Sam ----- Forwarded message from Linux Kernel Mailing List <linux-kernel@vger.kernel.org> ----- Subject: kbuild: fix gen_initramfs_list.sh Sender: git-commits-head-owner@vger.kernel.org From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Date: Mon, 8 May 2006 16:59:14 GMT To: git-commits-head@vger.kernel.org X-Mailing-List: git-commits-head@vger.kernel.org commit 46ed981d5d203703a01137cc58c841d34e90c147 tree 181da...

gen_initramfs_list.sh failed to generate a dependency list when it was supplied the -d option. Restructured gen_initramfs_list.sh to support dependency info with -d. This also fixes a bug where we did not properly process when more than one dir was specified. Finally update dependency info for the -d case (list_defau...

Harcoding default content of initramfs in the gen_initramfs_list.sh script seems ackward. Move it to a file named: usr/initramfs.default This also fixes a small bug when no arguments was passed to CONFIG_INITRAMFS_SOURCE (-d was passed twice to the script) Idea and bug report from: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Sam Ravnborg &...

...so path differ if applied to the klibc tree. This one has passed all my trivial testing. touch usr/kinit/kinit.o && make usr/ will regenerate cpio image. But with all the troubles this simple issue has caused me I woul not be suprised if there are some untested cornercase. Sam scripts/gen_initramfs_list.sh | 8 ++++++ usr/Kbuild | 52 ++++++++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh index 45c81b0..a609970 100644 --- a/scripts/gen_initramfs_list.sh +++ b/s...

Harcoding default content of initramfs in the gen_initramfs_list.sh script seems ackward. Move it to a file named: usr/initramfs.default This also fixes a small bug when no arguments was passed to CONFIG_INITRAMFS_SOURCE (-d was passed twice to the script) Idea and bug report from: "H. Peter Anvin" <hpa at zytor.com> Signed-off-by: Sam Ravnbor...

...But as it fixes a real (but rare I hope) bug in vanilla kernel it will be added to my pending 2.6.17 kbuild queue. I've done quite some changes to the gen_initramfs script and being shell programming newbie review by more experienced shell hackers would be appreciated. I did a git mv scripts/gen_initramfs_list.sh usr/gen_initramfs.sh But the changes was so many that git does not see the rename. Due to the rename the diffstat shows a bit mroe changes than reality. Sam b/usr/Makefile | 82 ++++-------- b/usr/gen_initramfs.sh | 285 ++++++++++++++++++++++++++++++++++++++++++ scr...

...uitous begin and end quotes from the Kconfig string type. -# Internal, escaped quotes in the Kconfig string will loose the -# escape and become active quotes. -quotefixed_initramfs_source := $(shell echo $(CONFIG_INITRAMFS_SOURCE)) - -filechk_initramfs_list = $(CONFIG_SHELL) \ - $(srctree)/scripts/gen_initramfs_list.sh $(gen_initramfs_args) \ - $(quotefixed_initramfs_source) - -$(obj)/initramfs_list: $(src)/Kbuild FORCE - $(call filechk,initramfs_list) - -quiet_cmd_cpio = CPIO $@ - cmd_cpio = ./$< $(obj)/initramfs_list > $@ - +##### +# Generate the initra...

...ded in the initramfs and rebuild it if any files are newer than the initramfs and also rebuild if arguments changes (root_uid). In same process the usr/Kbuild file was cluttered with functionality that really belonged in a shell script. So in the end all functionality was moved to the shell script gen_initramfs_list.sh. The script got a new name and a new home during the process. It is now located in usr/ along with gen_init_cpio Outstanding issues: - needs to find a nice way to get rid of temp files - carefull review when I'm awake again Posting it here to get some inital comments on the approach and ma...

...uitous begin and end quotes from the Kconfig string type. -# Internal, escaped quotes in the Kconfig string will loose the -# escape and become active quotes. -quotefixed_initramfs_source := $(shell echo $(CONFIG_INITRAMFS_SOURCE)) - -filechk_initramfs_list = $(CONFIG_SHELL) \ - $(srctree)/scripts/gen_initramfs_list.sh $(gen_initramfs_args) \ - $(quotefixed_initramfs_source) - -$(obj)/initramfs_list: $(src)/Kbuild FORCE - $(call filechk,initramfs_list) - -quiet_cmd_cpio = CPIO $@ - cmd_cpio = ./$< $(obj)/initramfs_list > $@ - - -# Check if the INITRAMFS_S...

...itramfs_data.cpio.gz FORCE +$(initramfs-y): $(obj)/klibc/libc.a + $(Q)$(MAKE) -f $(srctree)/scripts/Kbuild.klibc obj=$@ + ifdef CONFIG_INITRAMFS_ROOT_UID gen_initramfs_args += -u $(CONFIG_INITRAMFS_ROOT_UID) endif @@ -34,7 +45,7 @@ filechk_initramfs_list = $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh $(gen_initramfs_args) \ $(quotefixed_initramfs_source) -$(obj)/initramfs_list: FORCE +$(obj)/initramfs_list: $(src)/Kbuild FORCE $(call filechk,initramfs_list) quiet_cmd_cpio = CPIO $@ diff --git a/kernel/Kbuild.klibc b/kernel/Kbuild.klibc --...

Hi Peter & others. Here are three patches that does the following: #1 - Update kbuild part of klibc so make clean works Adds gzip including a sample kbuild file #2 - Factor out definition of usr/ to two variables #3 - Move kbuild files to reflect location in the kernel As requested in earlier mail I need a bit of guidiance of what you expect from the kernel integrated parts of klibc.

...cpio.gz image. +# The image is included using .incbin, a dependency which is not +# tracked automatically. +$(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE + +##### +# Generate the initramfs cpio archive + +hostprogs-y := gen_init_cpio +ginitramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh +ramfs-def := $(srctree)/$(src)/initramfs.default +ramfs-input := $(shell echo $(CONFIG_INITRAMFS_SOURCE)) +ramfs-input := $(if $(ramfs-input), $(ramfs-input), $(ramfs-def)) + +ramfs-args := \ + $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \ + $(if $(CONFI...

I have updated the klibc patchset based on feedback received. In particular, the patchset has been reorganized so as not to break git-bisect. Additionally, this updates the patch base to 2.6.17-git12 (d38b69689c349f35502b92e20dafb30c62d49d63) and klibc 1.4.8; the main difference on the klibc side is removal of obsolete code. This is also available as a git tree at: