Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1386415 > unrolled thread

[PATCH 1/3] kbuild: call adjust_autoksyms.sh from source directory

Started byArnd Bergmann <arnd@arndb.de>
First post2016-04-25 15:20 +0200
Last post2016-04-25 18:10 +0200
Articles 6 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/3] kbuild: call adjust_autoksyms.sh from source directory Arnd Bergmann <arnd@arndb.de> - 2016-04-25 15:20 +0200
    [PATCH 3/3] samples: v4l: from Documentation to samples directory Arnd Bergmann <arnd@arndb.de> - 2016-04-25 15:30 +0200
    Re: [PATCH 1/3] kbuild: call adjust_autoksyms.sh from source  directory Nicolas Pitre <nicolas.pitre@linaro.org> - 2016-04-25 16:20 +0200
      Re: [PATCH 1/3] kbuild: call adjust_autoksyms.sh from source directory Arnd Bergmann <arnd@arndb.de> - 2016-04-25 17:30 +0200
        Re: [PATCH 1/3] kbuild: call adjust_autoksyms.sh from source  directory Nicolas Pitre <nicolas.pitre@linaro.org> - 2016-04-25 17:40 +0200
          Re: [PATCH 1/3] kbuild: call adjust_autoksyms.sh from source directory Arnd Bergmann <arnd@arndb.de> - 2016-04-25 18:10 +0200

#1386415 — [PATCH 1/3] kbuild: call adjust_autoksyms.sh from source directory

FromArnd Bergmann <arnd@arndb.de>
Date2016-04-25 15:20 +0200
Subject[PATCH 1/3] kbuild: call adjust_autoksyms.sh from source directory
Message-ID<rrOAG-6uE-5@gated-at.bofh.it>
When building with separate object trees, scripts/adjust_autoksyms.sh
cannot be called from the object directory:

/bin/bash: scripts/adjust_autoksyms.sh: No such file or directory

This adds a $(src) prefix, as we do for all other shell scripts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 23121ca2b56b ("kbuild: create/adjust generated/autoksyms.h")
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 81534210dcb9..b5c67617a98d 100644
--- a/Makefile
+++ b/Makefile
@@ -945,7 +945,7 @@ quiet_cmd_link-vmlinux = LINK    $@
 # execute if the rest of the kernel build went well.
 vmlinux: scripts/link-vmlinux.sh $(vmlinux-deps) FORCE
 ifdef CONFIG_TRIM_UNUSED_KSYMS
-	$(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh \
+	$(Q)$(CONFIG_SHELL) $(src)/scripts/adjust_autoksyms.sh \
 	  "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile autoksyms_recursive"
 endif
 ifdef CONFIG_HEADERS_CHECK
@@ -960,13 +960,13 @@ endif
 	+$(call if_changed,link-vmlinux)
 
 autoksyms_recursive: $(vmlinux-deps)
-	$(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh \
+	$(Q)$(CONFIG_SHELL) $(src)/scripts/adjust_autoksyms.sh \
 	  "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile autoksyms_recursive"
 PHONY += autoksyms_recursive
 
 # standalone target for easier testing
 include/generated/autoksyms.h: FORCE
-	$(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh true
+	$(Q)$(CONFIG_SHELL) $(src)/scripts/adjust_autoksyms.sh true
 
 # Build samples along the rest of the kernel
 ifdef CONFIG_SAMPLES
-- 
2.7.0

[toc] | [next] | [standalone]

#1386429 — [PATCH 3/3] samples: v4l: from Documentation to samples directory

FromArnd Bergmann <arnd@arndb.de>
Date2016-04-25 15:30 +0200
Subject[PATCH 3/3] samples: v4l: from Documentation to samples directory
Message-ID<rrOKn-6zz-31@gated-at.bofh.it>
In reply to#1386415
With the new autoksyms support, we can run into a situation where
the v4l pci skeleton module is the only one using some exported
symbols that get dropped because they are never referenced by
the kernel otherwise, causing a build problem:

ERROR: "vb2_dma_contig_memops" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "vb2_dma_contig_init_ctx_attrs" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "v4l2_match_dv_timings" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "v4l2_find_dv_timings_cap" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "v4l2_valid_dv_timings" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "v4l2_enum_dv_timings_cap" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "vb2_dma_contig_cleanup_ctx" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!

Specifically, we do look in the samples directory for users of
symbols, but not the Documentation directory.

This solves the build problem by moving the connector sample into
the same directory as the other samples.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 23121ca2b56b ("kbuild: create/adjust generated/autoksyms.h")
---
 Documentation/Makefile                                         | 3 +--
 Documentation/video4linux/v4l2-framework.txt                   | 2 +-
 samples/Makefile                                               | 2 +-
 {Documentation/video4linux => samples/v4l}/Makefile            | 0
 {Documentation/video4linux => samples/v4l}/v4l2-pci-skeleton.c | 0
 5 files changed, 3 insertions(+), 4 deletions(-)
 rename {Documentation/video4linux => samples/v4l}/Makefile (100%)
 rename {Documentation/video4linux => samples/v4l}/v4l2-pci-skeleton.c (100%)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 13b5ae1b87aa..de955e151af8 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,4 +1,3 @@
 subdir-y := accounting auxdisplay blackfin \
 	filesystems filesystems ia64 laptops mic misc-devices \
-	networking pcmcia prctl ptp timers vDSO video4linux \
-	watchdog
+	networking pcmcia prctl ptp timers vDSO watchdog
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index fa41608ab2b4..cbefc7902f5f 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -35,7 +35,7 @@ need and this same framework should make it much easier to refactor
 common code into utility functions shared by all drivers.
 
 A good example to look at as a reference is the v4l2-pci-skeleton.c
-source that is available in this directory. It is a skeleton driver for
+source that is available in samples/v4l/. It is a skeleton driver for
 a PCI capture card, and demonstrates how to use the V4L2 driver
 framework. It can be used as a template for real PCI video capture driver.
 
diff --git a/samples/Makefile b/samples/Makefile
index 594ef7d9fa2a..2e3b523d7097 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -2,4 +2,4 @@
 
 obj-$(CONFIG_SAMPLES)	+= kobject/ kprobes/ trace_events/ livepatch/ \
 			   hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
-			   configfs/ connector/
+			   configfs/ connector/ v4l/
diff --git a/Documentation/video4linux/Makefile b/samples/v4l/Makefile
similarity index 100%
rename from Documentation/video4linux/Makefile
rename to samples/v4l/Makefile
diff --git a/Documentation/video4linux/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleton.c
similarity index 100%
rename from Documentation/video4linux/v4l2-pci-skeleton.c
rename to samples/v4l/v4l2-pci-skeleton.c
-- 
2.7.0

[toc] | [prev] | [next] | [standalone]

#1386495 — Re: [PATCH 1/3] kbuild: call adjust_autoksyms.sh from source directory

FromNicolas Pitre <nicolas.pitre@linaro.org>
Date2016-04-25 16:20 +0200
SubjectRe: [PATCH 1/3] kbuild: call adjust_autoksyms.sh from source directory
Message-ID<rrPwJ-7gP-9@gated-at.bofh.it>
In reply to#1386415
On Mon, 25 Apr 2016, Arnd Bergmann wrote:

> When building with separate object trees, scripts/adjust_autoksyms.sh
> cannot be called from the object directory:
> 
> /bin/bash: scripts/adjust_autoksyms.sh: No such file or directory
> 
> This adds a $(src) prefix, as we do for all other shell scripts.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

I posted fixes for all those problems already, plus another.

You may grab them all at once from this branch where I committed them on 
top of Michal's kbuild branch:

	git://git.linaro.org/people/nicolas.pitre/linux kbuild


Nicolas

[toc] | [prev] | [next] | [standalone]

#1386584

FromArnd Bergmann <arnd@arndb.de>
Date2016-04-25 17:30 +0200
Message-ID<rrQCv-89O-41@gated-at.bofh.it>
In reply to#1386495
On Monday 25 April 2016 10:18:56 Nicolas Pitre wrote:
> On Mon, 25 Apr 2016, Arnd Bergmann wrote:
> 
> > When building with separate object trees, scripts/adjust_autoksyms.sh
> > cannot be called from the object directory:
> > 
> > /bin/bash: scripts/adjust_autoksyms.sh: No such file or directory
> > 
> > This adds a $(src) prefix, as we do for all other shell scripts.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> 
> I posted fixes for all those problems already, plus another.
> 
> You may grab them all at once from this branch where I committed them on 
> top of Michal's kbuild branch:
> 
>         git://git.linaro.org/people/nicolas.pitre/linux kbuild
> 

Ok, thanks!

I liked the idea of moving the samples from Documentation to samples,
but with your patches that is no longer required to fix the bug.

If the respective maintainers want to pick up my patches 2 and 3
independent of your fixes, I can rewrite the changelogs for those,
otherwise I'll just drop them all.

	Arnd

[toc] | [prev] | [next] | [standalone]

#1386594 — Re: [PATCH 1/3] kbuild: call adjust_autoksyms.sh from source directory

FromNicolas Pitre <nicolas.pitre@linaro.org>
Date2016-04-25 17:40 +0200
SubjectRe: [PATCH 1/3] kbuild: call adjust_autoksyms.sh from source directory
Message-ID<rrQMa-8el-17@gated-at.bofh.it>
In reply to#1386584
On Mon, 25 Apr 2016, Arnd Bergmann wrote:

> On Monday 25 April 2016 10:18:56 Nicolas Pitre wrote:
> > On Mon, 25 Apr 2016, Arnd Bergmann wrote:
> > 
> > > When building with separate object trees, scripts/adjust_autoksyms.sh
> > > cannot be called from the object directory:
> > > 
> > > /bin/bash: scripts/adjust_autoksyms.sh: No such file or directory
> > > 
> > > This adds a $(src) prefix, as we do for all other shell scripts.
> > > 
> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > 
> > I posted fixes for all those problems already, plus another.
> > 
> > You may grab them all at once from this branch where I committed them on 
> > top of Michal's kbuild branch:
> > 
> >         git://git.linaro.org/people/nicolas.pitre/linux kbuild
> > 
> 
> Ok, thanks!
> 
> I liked the idea of moving the samples from Documentation to samples,
> but with your patches that is no longer required to fix the bug.
> 
> If the respective maintainers want to pick up my patches 2 and 3
> independent of your fixes, I can rewrite the changelogs for those,
> otherwise I'll just drop them all.

I agree this was a bit unexpected to have compiled code in the docs 
directory.  Whatever the reason, I didn't want autoksyms to interfere 
here.  Still, I think it is still a good idea you rewrite your changelog 
to judge those patches in the context of the reasons for having code 
there in the first place.


Nicolas

[toc] | [prev] | [next] | [standalone]

#1386619

FromArnd Bergmann <arnd@arndb.de>
Date2016-04-25 18:10 +0200
Message-ID<rrRfc-hZ-9@gated-at.bofh.it>
In reply to#1386594
On Monday 25 April 2016 11:31:22 Nicolas Pitre wrote:
> I agree this was a bit unexpected to have compiled code in the docs 
> directory.  Whatever the reason, I didn't want autoksyms to interfere 
> here.  Still, I think it is still a good idea you rewrite your changelog 
> to judge those patches in the context of the reasons for having code 
> there in the first place.
> 

Ok, I've sent them out again now.

	Arnd

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web