search for: hostprog

...eplace all dir/ with dir/klib.list +klib-objs := $(patsubst %/, %/klib.list, $(klib-y)) +# remove all dirs +klib-y := $(filter-out %/, $(klib-y)) + # $(output-dirs) are a list of directories that contain object files output-dirs := $(dir $(kprog-dirs) $(kprog-objs)) output-dirs += $(foreach f, $(hostprogs-y) $(targets), \ $(if $(dir $(f)), $(dir $(f)))) +output-dirs += $(klib-dirs) output-dirs := $(strip $(sort $(filter-out ./,$(output-dirs)))) # prefix so we get full dir @@ -160,9 +187,13 @@ kprog-real-objs := $(addprefix $(obj)/,$ output-dirs := $(addprefix $(obj)/,$(outp...

...-1,87 +0,0 @@ -# -# kbuild file for usr/ - including initramfs image and klibc -# - -klibc definitions - to be moved to top-level Makefile later -export KLIBSRC := $(srctree)/$(src)/klibc -export KLIBINC := $(srctree)/$(src)/include - -obj-y := initramfs_data.o -always := klibc/libc.a -hostprogs-y := gen_init_cpio -clean-files := initramfs_data.cpio.gz initramfs_list - -# Descend down into klibc when cleaning -subdir- := klibc - -# Build klibc library -$(obj)/klibc/libc.a: FORCE - $(Q)$(MAKE) -rR -f $(srctree)/scripts/Kbuild.klibc obj=$(obj)/klibc - -initramfs-y += gzip - -initramf...

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.

.../, $(klibc-objs))) +# replace all dir/ with dir/lib.a +klibc-objs := $(patsubst %/, %/lib.a, $(klibc-objs)) + +targets += $(static-y) $(shared-y) + +# $(output-dirs) are a list of directories that contain object files +output-dirs := $(dir $(klibc-dirs) $(klibc-objs)) +output-dirs += $(foreach f, $(hostprogs-y) $(targets), \ + $(if $(dir $(f)), $(dir $(f)))) +output-dirs := $(strip $(sort $(filter-out ./,$(output-dirs)))) + +# prefix so we get full dir +static-y := $(addprefix $(obj)/,$(static-y)) +shared-y := $(addprefix $(obj)/,$(shared-y)) +klibc-objs := $(addprefix...

.../genksyms make -f scripts/Makefile.build obj=scripts/mod scripts/mod/mk_elfconfig x86_64 < scripts/mod/empty.o > scripts/mod/elfconfig.h Error: not ELF make[2]: *** [scripts/mod/elfconfig.h] Error 1 make[1]: *** [scripts/mod] Error 2 make: *** [scripts] Error 2 $cat scripts/Makefile.build hostprogs-y := modpost mk_elfconfig always := $(hostprogs-y) empty.o modpost-objs := modpost.o file2alias.o sumversion.o # dependencies on generated files need to be listed explicitly $(obj)/modpost.o $(obj)/file2alias.o $(obj)/sumversion.o: $(obj)/elfconfig.h quiet_cmd_elfconfig = MKELF $@ cmd_elf...

...+spotless: clean + rm -f *~ + +# These should presumably be shared... +install: all + $(INSTALL_EXEC) gzip gunzip zcat $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)bin + +endif diff --git a/kernel/Kbuild b/kernel/Kbuild --- a/kernel/Kbuild +++ b/kernel/Kbuild @@ -7,15 +7,26 @@ always := klibc/libc.a hostprogs-y := gen_init_cpio clean-files := initramfs_data.cpio.gz initramfs_list +# Descend down into klibc when cleaning +subdir- := klibc + # Build klibc library $(obj)/klibc/libc.a: FORCE $(Q)$(MAKE) -rR -f $(srctree)/scripts/Kbuild.klibc obj=$(obj)/klibc +initramfs-y += gzip + +initramf...

...- a/scripts/Makefile.host +++ b/scripts/Makefile.host @@ -5,7 +5,7 @@ # # Both C and C++ is supported, but preferred language is C for such utilities. # -# Samle syntax (see Documentation/kbuild/makefile.txt for reference) +# Sample syntax (see Documentation/kbuild/makefile.txt for reference) # hostprogs-y := bin2hex # Will compile bin2hex.c and create an executable named bin2hex # diff --git a/usr/klibc/CAVEATS b/usr/klibc/CAVEATS index 2cead70..5e991cb 100644 --- a/usr/klibc/CAVEATS +++ b/usr/klibc/CAVEATS @@ -1,5 +1,5 @@ ------------------------------------------------- - Please note th...

...rce)") when a cpio archive is directly specified.) -endif -# Now use the cpio archive directly -initramfs_data_cpio = $(quotefixed_initramfs_source) -targets += $(quotefixed_initramfs_source) - -else - -# INITRAMFS_SOURCE is not a cpio archive - create one +# Create cpio archive from filelist hostprogs-y := gen_init_cpio -$(obj)/initramfs_data.cpio: $(obj)/gen_init_cpio \ - $(obj)/initramfs_list FORCE - $(call if_changed,cpio) - -targets += initramfs_data.cpio -initramfs_data_cpio = $(obj)/initramfs_data.cpio - -endif +# Files included in cpio archive (cpio archive...

...rg" "$#" - ;; "-"*) unknown_option ;; *) process_file "$arg" "$#" diff --git a/usr/Kbuild b/usr/Kbuild index e338cf9..bc50c48 100644 --- a/usr/Kbuild +++ b/usr/Kbuild @@ -53,14 +53,14 @@ ##### # Generate the initramfs cpio archive hostprogs-y := gen_init_cpio -ginitramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh +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 $(...

...- process it - input_file "$arg" "$#" + *) process_file "$arg" "$#" ;; esac ;; diff --git a/usr/Kbuild b/usr/Kbuild index e243e11..c4f5be2 100644 --- a/usr/Kbuild +++ b/usr/Kbuild @@ -37,8 +37,9 @@ # Generate the initramfs cpio archive hostprogs-y := gen_init_cpio initramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh -ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \ - $(CONFIG_INITRAMFS_SOURCE),-d) +ramfs-input := $(shell echo $(CONFIG_INITRAMFS_SOURCE)) +ramfs-input := $(i...

...@@ -2,6 +2,10 @@ # kbuild file for usr/ - including initramfs image and klibc # +klibc definitions - to be moved to top-level Makefile later +export KLIBSRC := $(srctree)/$(src)/klibc +export KLIBINC := $(srctree)/$(src)/include + obj-y := initramfs_data.o always := klibc/libc.a hostprogs-y := gen_init_cpio diff --git a/klibc/socketcalls/Kbuild b/klibc/socketcalls/Kbuild --- a/klibc/socketcalls/Kbuild +++ b/klibc/socketcalls/Kbuild @@ -11,8 +11,6 @@ endif # Composite object containing all .o file always := socketcalls.o -klibc-dir := $(srctree)/usr/klibc - ##### # Generate s...

...(src)/$(patsubst _usr_%,%,$(@)) + +$(klibc-subdir): + $(Q)$(MAKE) $(klibc)=$(src)/$(patsubst _usr_%,%,$(@)) endif -subdir- := klibc kinit utils dash gzip + # Generate builtin.o based on initramfs_data.o obj-y := initramfs_data.o @@ -36,7 +53,7 @@ ##### # Generate the initramfs cpio archive hostprogs-y := gen_init_cpio -initramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh +ginitramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh ramfs-input := $(shell echo $(CONFIG_INITRAMFS_SOURCE)) ramfs-input := $(if $(ramfs-input), $(ramfs-input), -d) @@ -44,26 +61,17...

...cb 100644 --- a/usr/dash/Kbuild +++ b/usr/dash/Kbuild @@ -18,22 +18,22 @@ init-o-files := alias.o arith_yacc.o arith_yylex.o cd.o error.o eval.o exec.o ex gen-o-files := builtins.o init.o nodes.o syntax.o -sh-y := $(init-o-files) $(gen-o-files) +static/sh-y := $(init-o-files) $(gen-o-files) hostprogs-y := mkinit mksyntax mknodes mksignames gen-h-files := builtins.h nodes.h syntax.h token.h -static-y := sh +static-y := static/sh # The shared binary -shared-y := sh.shared -sh.shared-y := $(sh-y) +shared-y := shared/sh +shared/sh-y := $(static/sh-y) # For cleaning -targets := sh sh...

...Ravnborg <sam@ravnborg.org> diff --git a/usr/Makefile b/usr/Makefile index e2129cb..ed18668 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -1,65 +1,39 @@ +# +# kbuild file for usr/ - including initramfs image +# +# Generate builtin.o based on initramfs_data.o obj-y := initramfs_data.o -hostprogs-y := gen_init_cpio - -clean-files := initramfs_data.cpio.gz initramfs_list - # initramfs_data.o contains the initramfs_data.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 - -...

This series: 1. Updates the boot protocol to version 2.07 2. Clean up the existing build process, to get rid of tools/build and make the linker do more heavy lifting 3. Make the bzImage payload an ELF file. The bootloader can extract this as a naked ELF file by skipping over boot_params.setup_sects worth of 16-bit setup code. 4. Update the boot_params to 2.07, and update the

This series: 1. Updates the boot protocol to version 2.07 2. Clean up the existing build process, to get rid of tools/build and make the linker do more heavy lifting 3. Make the bzImage payload an ELF file. The bootloader can extract this as a naked ELF file by skipping over boot_params.setup_sects worth of 16-bit setup code. 4. Update the boot_params to 2.07, and update the

Building dash in parallel still fails: GEN dash/builtins.def HOSTCC dash/mkinit HOSTCC dash/mknodes HOSTCC dash/mksignames HOSTCC dash/mksyntax dash/mksignames.c:59: warning: function declaration isn?t a prototype dash/mksignames.c:365: warning: function declaration isn?t a prototype dash/mksignames.c:386: warning: function declaration isn?t a prototype KLIBCCC

Hi hpa & others. Following is a list of issues that I hope to be addressed soon so we are in even better shape for -mm inclusion. 1) rebuild initramfs when content changes. > It is a simple matter of copying in usr/Makefile from the latest > -linus kernel and replace the 10 first lines with the content from > klibc Kbuild file. 2) havesyscalls.h is not deleted after make

...ally. $(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE ##### # Generate the initramfs cpio archive # Following steps are executed: # Create list of files to be included in archive # If any of the files are newer than target generate new cpio archive # Create cpio archive from filelist hostprogs-y := gen_init_cpio # Files included in cpio archive (cpio archive is updated if # any included files are newer than the cpio archive) initramfs := $(CONFIG_SHELL) $(srctree)/$(src)/gen_initramfs ramfs-input = $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \...

...CFLAGS),$(KBUILD_CFLAGS)) # cc-option # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586) diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile index a5b4af4..42c5d50 100644 --- a/scripts/mod/Makefile +++ b/scripts/mod/Makefile @@ -4,8 +4,6 @@ OBJECT_FILES_NON_STANDARD := y hostprogs-y := modpost mk_elfconfig always := $(hostprogs-y) empty.o -CFLAGS_REMOVE_empty.o := $(ASM_MACRO_FLAGS) - modpost-objs := modpost.o file2alias.o sumversion.o devicetable-offsets-file := devicetable-offsets.h -- 2.7.4