search for: config_klibc

...o archive and gzip it # we are carefull to delete tmp files if [ ! -z ${output_file} ]; then diff --git a/usr/Kbuild b/usr/Kbuild index c4f5be2..e338cf9 100644 --- a/usr/Kbuild +++ b/usr/Kbuild @@ -8,21 +8,38 @@ export KLIBCINC := $(srctree)/$(src)/inc export KLIBCOBJ := $(objtree)/$(obj)/klibc CONFIG_KLIBC := 1 +klibc-subdir := klibc +usr-subdirs := kinit utils dash gzip +subdir- := $(klibc-subdir) $(usr-subdirs) + +usr-subdirs := $(addprefix _usr_,$(usr-subdirs)) +klibc-subdir := $(addprefix _usr_,$(klibc-subdir)) + # Klibc binaries ifdef CONFIG_KLIBC klibc := -f $(srctree)/scripts/Kbuil...

...sr/Kbuild +++ b/usr/Kbuild @@ -2,10 +2,6 @@ # # kbuild file for usr/ - including initramfs image and klibc # -# klibc definitions - to be moved to top-level Makefile later -export KLIBCSRC := $(srctree)/$(src)/klibc -export KLIBCINC := $(src)/include -export KLIBCOBJ := $(objtree)/$(obj)/klibc CONFIG_KLIBC := 1 klibc-subdir := klibc @@ -17,7 +13,6 @@ klibc-subdir := $(addprefix _usr_,$(klib # Klibc binaries ifdef CONFIG_KLIBC -klibc := -f $(srctree)/scripts/Kbuild.klibc obj # .initramfs_data.cpio.gz.d is used to identify all files included # in initramfs and to detect if any files are adde...

...h it up. Sam Restructured usr/Kbuild: # # kbuild file for usr/ - including initramfs image and klibc # # klibc definitions - to be moved to top-level Makefile later export KLIBCSRC := $(srctree)/$(src)/klibc export KLIBCINC := $(srctree)/$(src)/include export KLIBCOBJ := $(objtree)/$(obj)/klibc CONFIG_KLIBC := 1 # Klibc binaries ifdef CONFIG_KLIBC klibc := -f $(srctree)/scripts/Kbuild.klibc obj .PHONY: klibcdirs $(obj)/initramfs_list: klibcdirs klibcdirs: FORCE $(Q)$(MAKE) $(klibc)=$(src)/klibc $(Q)$(MAKE) $(klibc)=$(src)/kinit $(Q)$(MAKE) $(klibc)=$(src)/utils $(Q)$(MAKE) $(klibc)=$(src)/dash...

...c1959 100644 --- a/usr/Kbuild +++ b/usr/Kbuild @@ -4,7 +4,7 @@ # # klibc definitions - to be moved to top-level Makefile later export KLIBCSRC := $(srctree)/$(src)/klibc -export KLIBCINC := $(srctree)/$(src)/include +export KLIBCINC := $(src)/include export KLIBCOBJ := $(objtree)/$(obj)/klibc CONFIG_KLIBC := 1

We were using CONFIG_KLIB_ZIP in a couple of places where we meant to use CONFIG_KLIBC_ZIP. I also added the option to the defconfig. Signed-off-by: Anton Blanchard <anton at samba.org> --- defconfig | 1 + usr/gzip/Kbuild | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/defconfig b/defconfig index c10a4f5..04b98e9 100644 --- a/defconfig +++ b/de...

...libc.git;a=commit;h=c6fc1a4b086a5d6504bc5e1048f039f7a644d73b Author: Anton Blanchard <anton at samba.org> AuthorDate: Tue, 3 Dec 2013 18:15:58 +1100 Committer: H. Peter Anvin <hpa at zytor.com> CommitDate: Tue, 3 Dec 2013 10:53:46 -0800 [klibc] gzip: Fix typo CONFIG_KLIB_ZIP -> CONFIG_KLIBC_ZIP We were using CONFIG_KLIB_ZIP in a couple of places where we meant to use CONFIG_KLIBC_ZIP. I also added the option to the defconfig. Signed-off-by: Anton Blanchard <anton at samba.org> Signed-off-by: H. Peter Anvin <hpa at zytor.com> --- defconfig | 1 + usr/gzip/Kbuild |...

...# $(Q)$(MAKE) $(klibc)=dir +klibc := -rR -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Kbuild.klibc obj diff --git a/usr/Kbuild b/usr/Kbuild new file mode 100644 index 0000000..f874f51 --- /dev/null +++ b/usr/Kbuild @@ -0,0 +1,75 @@ +# +# kbuild file for usr/ - including initramfs image and klibc +# + +CONFIG_KLIBC := 1 + +include-subdir := include +klibc-subdir := klibc +usr-subdirs := kinit utils dash gzip +subdir- := $(include-subdir) $(klibc-subdir) $(usr-subdirs) + +usr-subdirs := $(addprefix _usr_,$(usr-subdirs)) +klibc-subdir := $(addprefix _usr_,$(klibc-subdir)) + +# Klibc binaries +ifdef CONFI...

...l > kinit? I can't speak for hpa, but I do have some ideas. I'll list a few of them later in this message. Yes, they would break any external INITRAMFS_SOURCE. > 24-klibc-basic-build-infrastructure.patch forces the klibc build, even > for > setups where it is not required. CONFIG_KLIBC, if it ever gets merged, > should > be optional. usr/initramfs.default as example has a hard requirement. > If CONFIG_KLIBC is off, only /dev, /dev/console and /root should be > part of > the cpio archive in the .init.ramfs ELF section. The exectuables come > from > the cpio...

...uild index f874f51..890811c 100644 --- a/usr/Kbuild +++ b/usr/Kbuild @@ -12,7 +12,7 @@ subdir- := $(include-subdir) $(klibc-subdir) $(usr-subdirs) usr-subdirs := $(addprefix _usr_,$(usr-subdirs)) klibc-subdir := $(addprefix _usr_,$(klibc-subdir)) -# Klibc binaries +# klibc binaries ifdef CONFIG_KLIBC # .initramfs_data.cpio.gz.d is used to identify all files included

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: