debian/control,debian/rules: Support a 'stage1' build profile (Closes: #695243)
This builds only linux-libc-dev, needed by native compilers.
This commit is contained in:
parent
3d3a4891f7
commit
be6de683ed
|
@ -154,7 +154,7 @@ class Gencontrol(Base):
|
||||||
cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags]
|
cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags]
|
||||||
makefile.add('binary-arch_%s_real' % arch, cmds=cmds_binary_arch)
|
makefile.add('binary-arch_%s_real' % arch, cmds=cmds_binary_arch)
|
||||||
|
|
||||||
# Shortcut to aid architecture bootstrapping
|
# For stage1 build profile
|
||||||
makefile.add('binary-libc-dev_%s' % arch,
|
makefile.add('binary-libc-dev_%s' % arch,
|
||||||
['source_none_real'],
|
['source_none_real'],
|
||||||
["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" %
|
["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" %
|
||||||
|
@ -187,6 +187,10 @@ class Gencontrol(Base):
|
||||||
raise RuntimeError('kernel-wedge exited with code %d' %
|
raise RuntimeError('kernel-wedge exited with code %d' %
|
||||||
kw_proc.returncode)
|
kw_proc.returncode)
|
||||||
|
|
||||||
|
# kernel-wedge currently chokes on Build-Profiles so add it now
|
||||||
|
for package in udeb_packages:
|
||||||
|
package['Build-Profiles'] = '<!stage1>'
|
||||||
|
|
||||||
self.merge_packages(packages, udeb_packages, arch)
|
self.merge_packages(packages, udeb_packages, arch)
|
||||||
|
|
||||||
# These packages must be built after the per-flavour/
|
# These packages must be built after the per-flavour/
|
||||||
|
@ -265,9 +269,14 @@ class Gencontrol(Base):
|
||||||
|
|
||||||
compiler = config_entry_base.get('compiler', 'gcc')
|
compiler = config_entry_base.get('compiler', 'gcc')
|
||||||
|
|
||||||
|
# Work out dependency from linux-headers to compiler. Strip
|
||||||
|
# restrictions, as they don't apply to binary Depends.
|
||||||
relations_compiler_headers = PackageRelation(
|
relations_compiler_headers = PackageRelation(
|
||||||
config_entry_relations.get('headers%' + compiler) or
|
config_entry_relations.get('headers%' + compiler) or
|
||||||
config_entry_relations.get(compiler))
|
config_entry_relations.get(compiler))
|
||||||
|
for group in relations_compiler_headers:
|
||||||
|
for entry in group:
|
||||||
|
entry.restrictions = []
|
||||||
|
|
||||||
relations_compiler_build_dep = PackageRelation(config_entry_relations[compiler])
|
relations_compiler_build_dep = PackageRelation(config_entry_relations[compiler])
|
||||||
for group in relations_compiler_build_dep:
|
for group in relations_compiler_build_dep:
|
||||||
|
|
|
@ -4,6 +4,8 @@ linux (4.3-1~exp2) UNRELEASED; urgency=medium
|
||||||
* mv643xx_eth: Re-enable TSO, fixed upstream in 4.3
|
* mv643xx_eth: Re-enable TSO, fixed upstream in 4.3
|
||||||
* debian/control: Move patchutils from Build-Depends to Build-Depends-Indep,
|
* debian/control: Move patchutils from Build-Depends to Build-Depends-Indep,
|
||||||
as we only use filterdiff when building linux-source-<version>
|
as we only use filterdiff when building linux-source-<version>
|
||||||
|
* debian/control,debian/rules: Support a 'stage1' build profile which
|
||||||
|
builds only linux-libc-dev (Closes: #695243)
|
||||||
|
|
||||||
-- Ben Hutchings <ben@decadent.org.uk> Sat, 07 Nov 2015 14:18:48 +0000
|
-- Ben Hutchings <ben@decadent.org.uk> Sat, 07 Nov 2015 14:18:48 +0000
|
||||||
|
|
||||||
|
|
|
@ -46,11 +46,11 @@ type: plain
|
||||||
|
|
||||||
[relations]
|
[relations]
|
||||||
# compilers
|
# compilers
|
||||||
gcc-4.6: gcc-4.6
|
gcc-4.6: gcc-4.6 <!stage1>
|
||||||
gcc-4.7: gcc-4.7
|
gcc-4.7: gcc-4.7 <!stage1>
|
||||||
gcc-4.8: gcc-4.8
|
gcc-4.8: gcc-4.8 <!stage1>
|
||||||
gcc-4.9: gcc-4.9
|
gcc-4.9: gcc-4.9 <!stage1>
|
||||||
gcc-5: gcc-5
|
gcc-5: gcc-5 <!stage1>
|
||||||
|
|
||||||
# initramfs-generators
|
# initramfs-generators
|
||||||
initramfs-fallback: linux-initramfs-tool
|
initramfs-fallback: linux-initramfs-tool
|
||||||
|
|
|
@ -22,5 +22,5 @@ hardware: multiprocessor 64-bit PA-RISC
|
||||||
hardware-long: HP PA-RISC 64-bit SMP systems with support for more than 4 GB RAM
|
hardware-long: HP PA-RISC 64-bit SMP systems with support for more than 4 GB RAM
|
||||||
|
|
||||||
[relations]
|
[relations]
|
||||||
gcc-4.9: gcc-4.9, binutils-hppa64, gcc-4.9-hppa64
|
gcc-4.9: gcc-4.9 <!stage1>, binutils-hppa64 <!stage1>, gcc-4.9-hppa64 <!stage1>
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@ endif
|
||||||
ifdef DEBIAN_KERNEL_JOBS
|
ifdef DEBIAN_KERNEL_JOBS
|
||||||
MAKEFLAGS += -j$(DEBIAN_KERNEL_JOBS)
|
MAKEFLAGS += -j$(DEBIAN_KERNEL_JOBS)
|
||||||
endif
|
endif
|
||||||
|
BUILD_STAGE1 := $(filter stage1,$(DEB_BUILD_PROFILES))
|
||||||
|
|
||||||
.NOTPARALLEL:
|
.NOTPARALLEL:
|
||||||
|
|
||||||
|
@ -30,21 +31,31 @@ build: build-arch build-indep
|
||||||
|
|
||||||
build-arch: debian/control
|
build-arch: debian/control
|
||||||
dh_testdir
|
dh_testdir
|
||||||
|
ifndef BUILD_STAGE1
|
||||||
$(MAKE) -f debian/rules.gen build-arch_$(DEB_HOST_ARCH)
|
$(MAKE) -f debian/rules.gen build-arch_$(DEB_HOST_ARCH)
|
||||||
|
endif
|
||||||
|
|
||||||
build-indep: debian/control
|
build-indep: debian/control
|
||||||
dh_testdir
|
dh_testdir
|
||||||
|
ifndef BUILD_STAGE1
|
||||||
$(MAKE) -f debian/rules.gen build-indep
|
$(MAKE) -f debian/rules.gen build-indep
|
||||||
|
endif
|
||||||
|
|
||||||
binary: binary-indep binary-arch
|
binary: binary-indep binary-arch
|
||||||
|
|
||||||
binary-arch:
|
binary-arch:
|
||||||
dh_testdir
|
dh_testdir
|
||||||
|
ifdef BUILD_STAGE1
|
||||||
|
$(MAKE) -f debian/rules.gen binary-libc-dev_$(DEB_HOST_ARCH)
|
||||||
|
else
|
||||||
$(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH)
|
$(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH)
|
||||||
|
endif
|
||||||
|
|
||||||
binary-indep:
|
binary-indep:
|
||||||
dh_testdir
|
dh_testdir
|
||||||
|
ifndef BUILD_STAGE1
|
||||||
$(MAKE) -f debian/rules.gen binary-indep
|
$(MAKE) -f debian/rules.gen binary-indep
|
||||||
|
endif
|
||||||
|
|
||||||
DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM)
|
DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM)
|
||||||
TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.xz
|
TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.xz
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Package: linux-compiler-gcc-4.9-arm
|
Package: linux-compiler-gcc-4.9-arm
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Depends: gcc-4.9, ${misc:Depends}
|
Depends: gcc-4.9, ${misc:Depends}
|
||||||
Architecture: armel armhf
|
Architecture: armel armhf
|
||||||
Multi-Arch: foreign
|
Multi-Arch: foreign
|
||||||
|
@ -7,6 +8,7 @@ Description: Compiler for Linux on ARM (meta-package)
|
||||||
Linux on armel and armhf.
|
Linux on armel and armhf.
|
||||||
|
|
||||||
Package: linux-compiler-gcc-4.8-s390
|
Package: linux-compiler-gcc-4.8-s390
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Depends: gcc-4.8, ${misc:Depends}
|
Depends: gcc-4.8, ${misc:Depends}
|
||||||
Architecture: s390 s390x
|
Architecture: s390 s390x
|
||||||
Multi-Arch: foreign
|
Multi-Arch: foreign
|
||||||
|
@ -15,6 +17,7 @@ Description: Compiler for Linux on IBM zSeries (meta-package)
|
||||||
Linux on s390 and s390x.
|
Linux on s390 and s390x.
|
||||||
|
|
||||||
Package: linux-compiler-gcc-5-x86
|
Package: linux-compiler-gcc-5-x86
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Depends: gcc-5, ${misc:Depends}
|
Depends: gcc-5, ${misc:Depends}
|
||||||
Architecture: amd64 i386 x32
|
Architecture: amd64 i386 x32
|
||||||
Multi-Arch: foreign
|
Multi-Arch: foreign
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Package: linux-headers-@abiname@-all
|
Package: linux-headers-@abiname@-all
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Depends: linux-headers-@abiname@-all-${kernel:Arch} (= ${binary:Version}), ${misc:Depends}
|
Depends: linux-headers-@abiname@-all-${kernel:Arch} (= ${binary:Version}), ${misc:Depends}
|
||||||
Description: All header files for Linux @version@ (meta-package)
|
Description: All header files for Linux @version@ (meta-package)
|
||||||
This package depends against all architecture-specific kernel header files
|
This package depends against all architecture-specific kernel header files
|
||||||
|
@ -6,6 +7,7 @@ Description: All header files for Linux @version@ (meta-package)
|
||||||
kernel modules.
|
kernel modules.
|
||||||
|
|
||||||
Package: linux-headers-@abiname@-all-@arch@
|
Package: linux-headers-@abiname@-all-@arch@
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Depends: ${misc:Depends}
|
Depends: ${misc:Depends}
|
||||||
Description: All header files for Linux @version@ (meta-package)
|
Description: All header files for Linux @version@ (meta-package)
|
||||||
This package depends against all architecture-specific kernel header files
|
This package depends against all architecture-specific kernel header files
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Package: linux-headers-@abiname@-common@localversion_headers@
|
Package: linux-headers-@abiname@-common@localversion_headers@
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Depends: ${misc:Depends}
|
Depends: ${misc:Depends}
|
||||||
Description: Common header files for Linux @abiname@@localversion_headers@
|
Description: Common header files for Linux @abiname@@localversion_headers@
|
||||||
This package provides the architecture-specific common kernel header files
|
This package provides the architecture-specific common kernel header files
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Package: linux-headers-@abiname@@localversion@
|
Package: linux-headers-@abiname@@localversion@
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Depends: linux-headers-@abiname@-common@localversion_headers@ (= ${binary:Version}), linux-kbuild-@version@, ${misc:Depends}
|
Depends: linux-headers-@abiname@-common@localversion_headers@ (= ${binary:Version}), linux-kbuild-@version@, ${misc:Depends}
|
||||||
Description: Header files for Linux @abiname@@localversion@
|
Description: Header files for Linux @abiname@@localversion@
|
||||||
This package provides the architecture-specific kernel header files
|
This package provides the architecture-specific kernel header files
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Package: linux-image-@abiname@@localversion@-dbg
|
Package: linux-image-@abiname@@localversion@-dbg
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Depends: ${misc:Depends}
|
Depends: ${misc:Depends}
|
||||||
Section: debug
|
Section: debug
|
||||||
Priority: extra
|
Priority: extra
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Package: linux-image-@abiname@@localversion@
|
Package: linux-image-@abiname@@localversion@
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Provides: linux-modules-@abiname@@localversion@
|
Provides: linux-modules-@abiname@@localversion@
|
||||||
Pre-Depends: debconf | debconf-2.0
|
Pre-Depends: debconf | debconf-2.0
|
||||||
Depends: kmod, linux-base (>= 3~), ${misc:Depends}
|
Depends: kmod, linux-base (>= 3~), ${misc:Depends}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Package: linux-image-@abiname@@localversion@
|
Package: linux-image-@abiname@@localversion@
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Provides: linux-image
|
Provides: linux-image
|
||||||
Suggests: linux-doc-@version@
|
Suggests: linux-doc-@version@
|
||||||
Depends: ${misc:Depends}
|
Depends: ${misc:Depends}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Package: linux-source-@version@
|
Package: linux-source-@version@
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Section: kernel
|
Section: kernel
|
||||||
Depends: binutils, xz-utils, ${misc:Depends}
|
Depends: binutils, xz-utils, ${misc:Depends}
|
||||||
|
@ -13,6 +14,7 @@ Description: Linux kernel source for version @version@ with Debian patches
|
||||||
upstream maintainers.
|
upstream maintainers.
|
||||||
|
|
||||||
Package: linux-doc-@version@
|
Package: linux-doc-@version@
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: ${misc:Depends}
|
Depends: ${misc:Depends}
|
||||||
Section: doc
|
Section: doc
|
||||||
|
@ -26,6 +28,7 @@ Description: Linux kernel specific documentation for version @version@
|
||||||
for the detailed description of the contents.
|
for the detailed description of the contents.
|
||||||
|
|
||||||
Package: linux-manual-@version@
|
Package: linux-manual-@version@
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: ${misc:Depends}
|
Depends: ${misc:Depends}
|
||||||
Section: doc
|
Section: doc
|
||||||
|
@ -44,6 +47,7 @@ Description: Linux kernel API manual pages for version @version@
|
||||||
documentation in other formats is free from such restriction.
|
documentation in other formats is free from such restriction.
|
||||||
|
|
||||||
Package: linux-support-@abiname@
|
Package: linux-support-@abiname@
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Section: devel
|
Section: devel
|
||||||
Depends: ${python3:Depends}, ${misc:Depends}
|
Depends: ${python3:Depends}, ${misc:Depends}
|
||||||
|
|
|
@ -3,8 +3,9 @@ Priority: optional
|
||||||
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
|
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
|
||||||
Uploaders: Bastian Blank <waldi@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk>
|
Uploaders: Bastian Blank <waldi@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk>
|
||||||
Standards-Version: 3.9.5
|
Standards-Version: 3.9.5
|
||||||
Build-Depends: debhelper, cpio, kmod, python3, xz-utils, kernel-wedge, quilt, bc
|
Build-Depends: debhelper, python3, quilt,
|
||||||
Build-Depends-Indep: patchutils, xmlto
|
cpio <!stage1>, kmod <!stage1>, xz-utils <!stage1>, kernel-wedge <!stage1>, bc <!stage1>
|
||||||
|
Build-Depends-Indep: patchutils <!stage1>, xmlto <!stage1>
|
||||||
Vcs-Git: https://anonscm.debian.org/git/kernel/linux.git
|
Vcs-Git: https://anonscm.debian.org/git/kernel/linux.git
|
||||||
Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux.git
|
Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux.git
|
||||||
Homepage: https://www.kernel.org/
|
Homepage: https://www.kernel.org/
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Package: xen-linux-system-@abiname@@localversion@
|
Package: xen-linux-system-@abiname@@localversion@
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
Section: metapackages
|
Section: metapackages
|
||||||
Depends: linux-image-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
|
Depends: linux-image-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
|
||||||
Description: Xen system with Linux @upstreamversion@ on @class@ (meta-package)
|
Description: Xen system with Linux @upstreamversion@ on @class@ (meta-package)
|
||||||
|
|
Loading…
Reference in New Issue