search for: kbuild_src

...ibs/klibc/klibc.git;a=commit;h=22b36d1ae34416bc48869619cbb0cccb2070f48f Author: Ben Hutchings <ben at decadent.org.uk> AuthorDate: Fri, 25 Jan 2019 01:20:36 +0000 Committer: Ben Hutchings <ben at decadent.org.uk> CommitDate: Fri, 25 Jan 2019 02:38:03 +0000 [klibc] Makefile: Honour KBUILD_SRC variable Currently it's necessary to specify both KBUILD_SRC and srctree to make everything work properly in an out-of-tree build. It should only be necessary to specify KBUILD_SRC. Initialise srctree accordingly. Signed-off-by: Ben Hutchings <ben at decadent.org.uk> --- Makefile |...

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.

...)/usr/include/arch/$(ARCH) \ - -I$(srctree)/usr/include/bits$(BITSIZE) \ - -I$(srctree)/usr/include \ - -Iinclude \ - $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \ - -D__KLIBC__=1 -D__KLIBC_MINOR__=0 \ - -DBITSIZE=$(BITSIZE) -USERCFLAGS := $(USERCPPFLAGS) $(REQFLAGS) $(ARCHREQFLAGS) \ - $(OPTFLAGS) $(USERWARNFLAGS) -USERAFLAGS := -D__ASSEMBLY_...

...7 +113,7 @@ KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ # kernel include paths KLIBCKERNELSRC ?= $(srctree) KLIBCKERNELOBJ ?= $(objtree) -KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ +KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/usr/include \ $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)/include2 \ -I$(KLIBCKERNELOBJ)/include -I$(srctree)/include) \ $(KLIBCARCHINCFLAGS) diff --git a/usr/klibc/README.klibc b/usr/klibc/README.klibc index 7de5fea..3575ec9 100644 --- a/usr/klibc/README.klibc +++ b/usr/klibc/README.klibc @@ -9,9 +9,8 @@ thi...

...CARCHDIR)/MCONFIG @@ -113,10 +113,8 @@ KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ -I$(KLIBCINC) # kernel include paths KLIBCKERNELSRC ?= $(srctree) -KLIBCKERNELOBJ ?= $(objtree) -KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ - $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)/include2 \ - -I$(KLIBCKERNELOBJ)/include -I$(srctree)/include) \ +KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ + $(if $(KBUILD_SRC),-I$(srctree)/include) \ $(KLIBCARCHINCFLAGS) # klibc definitions diff --git a/usr/klibc/arch...

...-I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ + -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ + -I$(KLIBCOBJ)/../include \ + -I$(KLIBCINC) +# kernel include paths +KLIBCKERNELSRC ?= $(srctree)/ +KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)include \ + $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)include2 -I$(KLIBCKERNELOBJ)include -I$(srctree)/include) \ + $(KLIBCARCHINCFLAGS) + +# klibc definitions +KLIBCDEFS += -D__KLIBC__=$(KLIBCMAJOR) \ + -D__KLIBC_MINOR__=$(KLIBCMINOR) \ + -D_BITSIZE=$(KLIBCBITSIZE) +KLIBCCPPFLAGS += $(KLIBC...

Le 21/08/2013 17:36, leroy christophe a ?crit : > > Le 21/08/2013 17:15, maximilian attems a ?crit : >> On Wed, Aug 21, 2013 at 01:39:50PM +0200, leroy christophe wrote: >>> Le 21/08/2013 12:20, maximilian attems a ?crit : >>>> On Tue, Aug 20, 2013 at 07:44:39AM +0200, leroy christophe wrote: >>>>> Find attached two patches I have in order to build

We currently use KLIBCKERNELSRC and KLIBCKERNELOBJ variables which used to be required to point to a kernel source and object directories. However the kernel headers were reorganised starting in Linux 3.7 such that that doesn't work properly. This series removes KLIBCKERNELOBJ and changes the use and documentation of KLIBCKERNELSRC to be consistent. Ben. Ben Hutchings (4): [klibc]

...alpha: Fix dual1 system call wrapper [klibc] fcntl: Fix struct flock for 32-bit architectures [klibc] parisc: Fix vfork() [klibc] Fix errlist.c generation in out-of-tree build [klibc] alpha: Fix division routine generation in out-of-tree build [klibc] Makefile: Honour KBUILD_SRC variable Christophe Leroy (1): [klibc] fix build failure when CONFIG_KLIBC_ZLIB is not set James Clarke (1): [klibc] ia64: Fix shared build -- Ben Hutchings Life is what happens to you while you're busy making other plans....

...1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc index b7e99b56..a9a2a40e 100644 --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -118,13 +118,16 @@ KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ $(if $(KBUILD_SRC),-I$(srctree)/include) \ $(KLIBCARCHINCFLAGS) +# compiler/assembler option for whether we want an executable stack +KLIBCSTACKFLAGS := -Wa,$(if $(filter n,$(KLIBCEXECSTACK)),no)execstack + # klibc definitions KLIBCDEFS += -D__KLIBC__=$(KLIBCMAJOR) \ -D__KLIBC_MI...

Hi, From the Makefile I figured that to build klibc where the kernel was built with O=/someotherdir, you need to do: make KLIBCKERNELOBJ=/someotherdir KBUILD_SRC=1 Everything seems fine though, but it fails to link dash with: ----- KLIBCCC dash/bltin/printf.o KLIBCCC dash/system.o KLIBCCC dash/bltin/test.o KLIBCCC dash/bltin/times.o KLIBCCC dash/var.o GEN dash/init.c KLIBCCC dash/init.o KLIBCLD dash/sh KLIBCLD dash/sh.shared dash/bui...

...BCCFLAGS) $(EXTRA_KLIBCCFLAGS) $(KLIBCCFLAGS_$(*F).o) +__klibcaflags = $(KLIBCAFLAGS) $(EXTRA_KLIBCAFLAGS) $(KLIBCAFLAGS_$(*F).o) -_klibccflags = $(KLIBCCFLAGS) $(EXTRA_KLIBCCFLAGS) $(KLIBCCFLAGS_$(*F).o) -_klibcaflags = $(KLIBCAFLAGS) $(EXTRA_KLIBCAFLAGS) $(KLIBCAFLAGS_$(*F).o) +ifeq ($(KBUILD_SRC),) +_klibccflags = $(__klibccflags) +_klibcaflags = $(__klibcaflags) +else +_klibccflags = $(call flags,__klibccflags) +_klibcaflags = $(call flags,__klibcaflags) +endif klibccflags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(_klibccflags) klibcaflags = -Wp,-MD,$(depfile) $(NOS...

...7 +113,7 @@ KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ # kernel include paths KLIBCKERNELSRC ?= $(srctree) KLIBCKERNELOBJ ?= $(objtree) -KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ +KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/usr/include \ $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)/include2 \ -I$(KLIBCKERNELOBJ)/include -I$(srctree)/include) \ $(KLIBCARCHINCFLAGS)

The following patchset implements 3 seperate series of changes. External Building ================= Patches 1 through 8 enable to use of klibc's build system while leaving the src tree pristine (and potentially read only). Specifically: - srctree=<Sources for klibc> - objtree=<Ouput directory for klibc> - KLIBCKERNELSRC=<Kernel sources> - KLIBCKERNELOBJ=<Kernel

...arm/MCONFIG to build thumb code. +Out-of-tree builds +------------------ + +It is possible to use a separate build directory so that build +products are not created in source directories. To do this, +create the build directory and in that directory run: + make -f <source-dir>/Makefile KBUILD_SRC=<source-dir> + +Build configuration +------------------- + +The build configuration is defined in a ".config" file in the +build directory. If this file does not already exist, it is +created as a copy of the "defconfig" source file. + +The configuration variables are: +...

...13,7 @@ KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ # kernel include paths KLIBCKERNELSRC ?= $(srctree) KLIBCKERNELOBJ ?= $(objtree) -KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ +KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/usr/include \ $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)/include2 \ -I$(KLIBCKERNELOBJ)/include -I$(srctree)/include) \ $(KLIBCARCHINCFLAGS) diff --git a/usr/klibc/README.klibc b/usr/klibc/README.klibc index 7de5fea..3575ec9 100644 --- a/usr/klibc/README.klibc +++ b/usr/klibc/README.klibc @@ -9,9 +9,8 @@...

...ripts/Kbuild.klibc @@ -104,6 +104,7 @@ KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ # kernel include paths KLIBCKERNELSRC ?= $(srctree)/ KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)include \ + -I$(KLIBCKERNELSRC)/arch/$(KLIBCARCHDIR)/include \ $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)include2 -I$(KLIBCKERNELOBJ)include -I$(srctree)/include) \ $(KLIBCARCHINCFLAGS) -- 1.6.4.rc3.12.gdf73a

.../arch/$(KLIBCARCHDIR)/MCONFIG @@ -114,6 +115,7 @@ KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ KLIBCKERNELSRC ?= $(srctree) KLIBCKERNELOBJ ?= $(objtree) KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ + -I$(KLIBCKERNELSRC)/include/uapi \ $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)/include2 \ -I$(KLIBCKERNELOBJ)/include -I$(srctree)/include) \ $(KLIBCARCHINCFLAGS) diff --git a/usr/klibc/arch/x86_64/MCONFIG b/usr/klibc/arch/x86_64/MCONFIG index 4b1a33ad9f37..e45dfb029b31 100644 --- a/usr/klibc/arch/x86_64/MCONFIG +++ b/usr/klibc/a...

...cripts/Makefile.modpost # FIXME Should go into a make.lib or something diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index b0d067b..3c90468 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -87,6 +87,11 @@ # Usage: # $(Q)$(MAKE) $(build)=dir build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj +# Shorthand for $(Q)$(MAKE) -f scripts/Kbuild.klibc obj= +# Usage: +# $(Q)$(MAKE) $(klibc)=dir +klibc := -f $(srctree)/scripts/Kbuild.klibc obj + # Prefix -I with $(srctree) if it is not an absolute path addtree = $(if $(filter-out -I/%,$(1)),$(patsubst...

...ile, and the one that makes me nervous is make CC=cc KBUILD_OUTPUT=/lib/modules/2.6.18-194.3.1.el5/build KBUILD_VERBOS E=1 -C /lib/modules/2.6.18-194.3.1.el5/source SUBDIRS=/scratch/NVIDIA-Linux- x86-96.43.13-pkg1/usr/src/nv modules make -C /lib/modules/2.6.18-194.3.1.el5/build \ KBUILD_SRC=/usr/src/kernels/2.6.18-194.3.1.el5-i686 \ KBUILD_EXTMOD="/scratch/NVIDIA-Linux-x86-96.43.13-pkg1/usr/src/nv" -f /usr/ src/kernels/2.6.18-194.3.1.el5-i686/Makefile modules test -e include/linux/autoconf.h -a -e include/config/auto.conf || ( \ echo;...