From 415a6ba8422cb9af6116b64f08cef5865239d682 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 19 Oct 2011 15:51:15 +0200 Subject: [PATCH] call pbuilder with --bindmounts to support --overlay-dir for make-kpkg --- kernel-package-overlay/Control | 8 ++++---- kernel_build.py | 1 + kernel_inpbuilder.py | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/kernel-package-overlay/Control b/kernel-package-overlay/Control index 3383674..ddad738 100644 --- a/kernel-package-overlay/Control +++ b/kernel-package-overlay/Control @@ -12,7 +12,7 @@ Section: devel Priority: optional Recommends: libc6-dev | libc-dev, gcc | c-compiler, make (>= 3.80-10), binutils (>= 2.12), util-linux (>= 2.10o) Suggests: module-init-tools (>= 0.9.10), e2fsprogs (>= 1.29) -Provides: =ST-headers, =ST-headers-=CV +Provides: =ST-headers, =ST-headers-=CV, =ST-headers-PB_FLAVOUR Description: Header files related to Linux kernel, specifically, version =V . @@ -27,7 +27,7 @@ Package: =ST-source-=V Architecture: all Section: devel Priority: optional -Provides: =ST-source, =ST-source-=CV +Provides: =ST-source, =ST-source-=CV, =ST-source-PB_FLAVOUR Depends: binutils, bzip2, file Recommends: libc6-dev | libc-dev, gcc | c-compiler, make (>= 3.80-10), po-debconf, gettext, binutils (>= 2.12), util-linux (>= 2.10o), module-init-tools (>= 0.9.10), debianutils (>= 2.30) Suggests: libncurses-dev | ncurses-dev, kernel-package, xmlto, libdb3-dev, libncurses-dev, docbook-utils, e2fsprogs (>= 1.29), linux-initramfs-tool, ksymoops @@ -52,7 +52,7 @@ Package: =ST-image-=V=SA Architecture: =A Section: kernel Priority: optional -Provides: =ST-image, =ST-image-=CV +Provides: =ST-image, =ST-image-=CV, =ST-image-PB_FLAVOUR Pre-Depends: debconf (>= 0.2.17) | debconf-2.0 Depends: =I coreutils (>= 5.96) Suggests: fdutils, =ST-doc-=V=SA | =ST-source-=V, ksymoops, =ST-image-=V=SA-dbg @@ -76,7 +76,7 @@ Architecture: =A Section: debug Priority: optional Depends: =ST-image-=V=SA -Provides: =ST-debug, =ST-debug-=CV, =ST-debug-=V=SA +Provides: =ST-debug, =ST-debug-=CV, =ST-debug-=V=SA, =ST-image-PB_FLAVOUR-debug Suggests: systemtap Description: Linux kernel debug image for version =V=SA This package contains the Linux kernel debug image for version diff --git a/kernel_build.py b/kernel_build.py index 5b01597..e6f5de7 100644 --- a/kernel_build.py +++ b/kernel_build.py @@ -128,6 +128,7 @@ def build_kernel_with_pbuilder(revision, pbuilder_script, dist='stable'): PBUILDER, '--execute', '--hookdir', '""', + '--bindmounts', '"%s"' %(CWD), '--', pbuilder_script, '--cwd', '%s' %('/tmp'), diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index 87fcca1..6b4ca01 100644 --- a/kernel_inpbuilder.py +++ b/kernel_inpbuilder.py @@ -196,7 +196,7 @@ def git_checkout_branch(): ) return True -def build_kernel(version, revision, parallel_jobs='auto', distcc=False): +def build_kernel(flavour, revision, parallel_jobs='auto', distcc=False): if parallel_jobs == 'auto': parallel_jobs = DEFAULT_PARALLEL_JOBS else: @@ -204,7 +204,7 @@ def build_kernel(version, revision, parallel_jobs='auto', distcc=False): cmd = [MAKE_KPKG, '-j', '%s' %(parallel_jobs), '--arch', '%s' %(BUILD_ARCH), '--rootcmd', 'fakeroot', - '--append-to-version', '-%s' %(version), + '--append-to-version', '-%s' %(flavour), '--initrd', '--arch_in_name' ] # add targets @@ -213,7 +213,7 @@ def build_kernel(version, revision, parallel_jobs='auto', distcc=False): if GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME.startswith('hotfix'): cmd += [ 'kernel_doc' ] - logger.info('start compile process for version %s revision %s' % (version, revision)) + logger.info('start compile process for flavour %s revision %s' % (flavour, revision)) logger.debug( 'calling "%s" for compiling the kernel' %(' '.join(cmd)) -- 2.39.5