[REVIEW][Unstable] Introduce variant support for master kernel packages

classic Classic list List threaded Threaded
24 messages Options
12
Reply | Threaded
Open this post in threaded view
|

[REVIEW][Unstable] Introduce variant support for master kernel packages

Seth Forshee
For some backport packages in bionic we've adopted a scheme where
package names include the upstream version (e.g. linux-azure-5.3,
linux-meta-azure-5.3, etc.). For these packages a list of the variants
supported from the package (e.g. -edge) is used by linux-meta to
determine what meta packages need to be produced. This allows changing
the variant without rebuilding the kernel.

This has utility for the master kernels during development. We would be
able to introduce new kernel verions into the -proposed and -release
pockets earlier for testing while keeping the primary variant packages
at a better-tested kernel versions. The meta packages would be suffixed
with the variant, such as -wip as used in the patches which follow,
allowing e.g. linux-generic-wip to be installed for testing the
work-in-progress kernel.

Variant support is also likely to be useful after development, easing
the transition of hwe and hwe-edge to newer kernel version, for example.

Supporting variants is more complicated for the master kernel than for
derivatives. There are a handful of packages which should only produces
by the master kernel, such as linux-libc-dev, so the kernel source
package needs to be aware of variants to know whether or not to produce
these packages. linux-restricted-modules also produces meta packages,
which need to include variant suffixes. Therefore all packages will gain
a $DEBIAN/variants file. The list of variants for a given source package
will be maintained in kernel-series.yaml and updates by cranky-fix.

I'd appreciate review on the following patches for unstable which
implement variant support and prepare the packaging for including
upstream version numbers in the source package names. There are also
some cleanup patches. For the kernel package I've included an example of
changing the source package name from linux to linux-5.4. I did not
include patches changing the source package name for supporting
packages; these will be done when preparing new uploads.

I will point out that there are inconsistencies in the format of
substition variables for control files in these patches. This is because
it is inconsistent in our packaging. I used the format which seemed to
be predominant for each package. These should be unified, but I did not
do so as part of this work.

I've got a test build using these changes and new source package names
at https://launchpad.net/~sforshee/+archive/ubuntu/test-builds.

Thanks,
Seth

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 01/10][linux] UBUNTU: [Packaging] Don't use SRCPKGNAME for linux-libc-dev

Seth Forshee
When using SRCPKGNAME the name of the linux-libc-dev package will
change when we change to using linux-<ver> for the source package
names. The name should remain linux-libc-dev, so fix this in
control.stub.in.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian.master/control.stub.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index bf0a9f57bc67..5343f7e573c4 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -103,7 +103,7 @@ Description: Header files related to Linux kernel version PKGVER
  that want the latest kernel headers. Please read
  /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details
 
-Package: SRCPKGNAME-libc-dev
+Package: linux-libc-dev
 Architecture: amd64 armhf arm64 i386 ppc64el s390x
 Depends: ${misc:Depends}
 Conflicts: SRCPKGNAME-kernel-headers
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 02/10][linux] UBUNTU: [Packaging] Remove linux-source-3 Provides: from linux-source

Seth Forshee
In reply to this post by Seth Forshee
Signed-off-by: Seth Forshee <[hidden email]>
---
 debian.master/control.stub.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index 5343f7e573c4..f95852a48363 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -59,7 +59,7 @@ Build-Profiles: <!stage1>
 Architecture: all
 Section: devel
 Priority: optional
-Provides: linux-source, linux-source-3
+Provides: linux-source
 Depends: ${misc:Depends}, binutils, bzip2, coreutils
 Recommends: libc-dev, gcc, make
 Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 03/10][linux] UBUNTU: [Packaging] Fix linux-doc in linux-image Suggests:

Seth Forshee
In reply to this post by Seth Forshee
There is no linux-doc-<version> package, and the name of
linux-doc is not based on the source package name. Fix these
errors.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian.master/control.d/flavour-control.stub | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index ee041f9f060a..4ba31aa63ba5 100644
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -31,7 +31,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.
 Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool
 Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x]
 Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR
-Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
+Suggests: fdutils, linux-doc | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
 Description: Linux kernel image for version PKGVER on DESC
  This package contains the=SIGN-ME-TXT= Linux kernel image for version PKGVER on
  DESC.
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 04/10][linux] UBUNTU: [Debian] Read variants list into a variable

Seth Forshee
In reply to this post by Seth Forshee
Read the contents of $DEBIAN/variants into a variable, for use
in later patches. For backwards compatability, assume the primary
variant "--" if the variants file is not present.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/rules.d/0-common-vars.mk | 6 ++++++
 debian/rules.d/1-maintainer.mk  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index bcab5749f8aa..a5035def11d6 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -18,6 +18,12 @@ prev_revision := $(word $(words $(prev_revisions)),$(prev_revisions))
 
 prev_fullver ?= $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -o1 -c1 | sed -ne 's/^Version: *//p')
 
+# Get variants. Assume primary if debian/variants is not present.
+variants = --
+ifneq (,$(wildcard $(DEBIAN)/variants))
+ variants := $(shell cat $(DEBIAN)/variants)
+endif
+
 # Get upstream version info
 upstream_version := $(shell sed -n 's/^VERSION = \(.*\)$$/\1/p' Makefile)
 upstream_patchlevel := $(shell sed -n 's/^PATCHLEVEL = \(.*\)$$/\1/p' Makefile)
diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 6b4e0901c288..2c07c075f349 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -62,6 +62,7 @@ printenv:
  @echo "abinum            = $(abinum)"
  @echo "upstream_tag      = $(upstream_tag)"
  @echo "gitver            = $(gitver)"
+ @echo "variants          = $(variants)"
  @echo "flavours          = $(flavours)"
  @echo "skipabi           = $(skipabi)"
  @echo "skipmodule        = $(skipmodule)"
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 05/10][linux] UBUNTU: [Packaging] Generate linux-libc-dev package only for primary variant

Seth Forshee
In reply to this post by Seth Forshee
The only kernel which should ever generate a linux-libc-dev
package is the master kernel, i.e. the "--" variant. Set the
default value of do_libc_dev_package based on whether or not
the primary kernel is in the variants list. Move the
linux-libc-dev control paragraph into its own stub, which is
included in the control file only when do_libc_dev_package=true.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian.master/control.stub.in        | 13 -------------
 debian/control.d/linux-libc-dev.stub | 12 ++++++++++++
 debian/rules                         | 17 +++++++++++------
 debian/rules.d/0-common-vars.mk      |  7 ++++++-
 4 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 debian/control.d/linux-libc-dev.stub

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index f95852a48363..088bc785e280 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -103,19 +103,6 @@ Description: Header files related to Linux kernel version PKGVER
  that want the latest kernel headers. Please read
  /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details
 
-Package: linux-libc-dev
-Architecture: amd64 armhf arm64 i386 ppc64el s390x
-Depends: ${misc:Depends}
-Conflicts: SRCPKGNAME-kernel-headers
-Replaces: SRCPKGNAME-kernel-headers
-Provides: SRCPKGNAME-kernel-headers, aufs-dev
-Multi-Arch: same
-Description: Linux Kernel Headers for development
- This package provides headers from the Linux kernel.  These headers
- are used by the installed headers for GNU glibc and other system
- libraries. They are NOT meant to be used to build third-party modules for
- your kernel. Use SRCPKGNAME-headers-* packages for that.
-
 Package: SRCPKGNAME-tools-common
 Build-Profiles: <!stage1>
 Architecture: all
diff --git a/debian/control.d/linux-libc-dev.stub b/debian/control.d/linux-libc-dev.stub
new file mode 100644
index 000000000000..47ef2e1b521c
--- /dev/null
+++ b/debian/control.d/linux-libc-dev.stub
@@ -0,0 +1,12 @@
+Package: linux-libc-dev
+Architecture: amd64 armhf arm64 i386 ppc64el s390x
+Depends: ${misc:Depends}
+Conflicts: linux-kernel-headers
+Replaces: linux-kernel-headers
+Provides: linux-kernel-headers, aufs-dev
+Multi-Arch: same
+Description: Linux Kernel Headers for development
+ This package provides headers from the Linux kernel.  These headers
+ are used by the installed headers for GNU glibc and other system
+ libraries. They are NOT meant to be used to build third-party modules for
+ your kernel. Use SRCPKGNAME-headers-* packages for that.
diff --git a/debian/rules b/debian/rules
index 78ffcfc8c273..47cbe03de04f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -175,22 +175,27 @@ include $(DROOT)/rules.d/3-binary-indep.mk
 # Various checks to be performed on builds
 include $(DROOT)/rules.d/4-checks.mk
 
+control_files := $(DEBIAN)/control.stub.in
+ifeq ($(do_libc_dev_package),true)
+ control_files += $(DROOT)/control.d/linux-libc-dev.stub
+endif
+
 # Misc stuff
 .PHONY: $(DEBIAN)/control.stub
 $(DEBIAN)/control.stub: \
  $(DROOT)/scripts/control-create \
- $(DEBIAN)/control.stub.in \
+ $(control_files) \
  $(DEBIAN)/changelog \
  $(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars)
- for i in $(DEBIAN)/control.stub.in; do \
-  new=`echo $$i | sed 's/\.in$$//'`; \
-  cat $$i | sed -e 's/PKGVER/$(release)/g'                              \
+ for i in $(control_files); do                                           \
+  cat $$i;                                                              \
+  echo "";                                                              \
+ done | sed -e 's/PKGVER/$(release)/g'                                   \
         -e 's/ABINUM/$(abinum)/g'                                       \
  -e 's/SRCPKGNAME/$(src_pkg_name)/g'                             \
  -e 's/=HUMAN=/$(human_arch)/g'                                  \
  -e 's/=SERIES=/$(series)/g'                                     \
-  > $$new; \
- done
+  > $(DEBIAN)/control.stub;
  flavours="$(sort $(wildcard $(DEBIAN)/control.d/vars.* $(DEBIAN)/sub-flavours/*.vars))";\
  for i in $$flavours; do \
   $(SHELL) $(DROOT)/scripts/control-create $$i "$(any_signed)" | \
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index a5035def11d6..37574fbbdfde 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -169,8 +169,13 @@ ifeq ($(full_build),false)
 do_source_package_content=false
 endif
 
-# linux-libc-dev may not be needed, default to building it.
+# linux-libc-dev may not be needed, default to building it only for the
+# primary variant
+ifneq ($(filter --,$(variants)),)
 do_libc_dev_package=true
+else
+do_libc_dev_package=false
+endif
 
 # common headers normally is built as an indep package, but may be arch
 do_common_headers_indep=true
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 06/10][linux] UBUNTU: [Packaging] Generate linux-doc for only the primary variant

Seth Forshee
In reply to this post by Seth Forshee
Even though the doc package is generated as SRCPKGNAME-doc in the
control stub, we're really only set up to have a single doc
package. Therefore split out linux-doc into its own control stub,
which will be included in the control file for only the primary
variant.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian.master/control.stub.in   | 13 -------------
 debian/control.d/linux-doc.stub | 12 ++++++++++++
 debian/rules                    |  3 +++
 debian/rules.d/0-common-vars.mk |  4 ++++
 4 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 debian/control.d/linux-doc.stub

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index 088bc785e280..255577966204 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -78,19 +78,6 @@ Description: Linux kernel source for version PKGVER with Ubuntu patches
  you do not want this package. Install the appropriate linux-headers
  package instead.
 
-Package: SRCPKGNAME-doc
-Build-Profiles: <!stage1>
-Architecture: all
-Section: doc
-Priority: optional
-Depends: ${misc:Depends}
-Description: Linux kernel specific documentation for version PKGVER
- This package provides the various documents in the PKGVER kernel
- Documentation/ subdirectory.  These document kernel subsystems, APIs, device
- drivers, and so on.  See
- /usr/share/doc/SRCPKGNAME-doc/00-INDEX for a list of what is
- contained in each file.
-
 Package: SRCPKGNAME-headers-PKGVER-ABINUM
 Build-Profiles: <!stage1>
 Architecture: all
diff --git a/debian/control.d/linux-doc.stub b/debian/control.d/linux-doc.stub
new file mode 100644
index 000000000000..a0e04473286d
--- /dev/null
+++ b/debian/control.d/linux-doc.stub
@@ -0,0 +1,12 @@
+Package: linux-doc
+Build-Profiles: <!stage1>
+Architecture: all
+Section: doc
+Priority: optional
+Depends: ${misc:Depends}
+Description: Linux kernel specific documentation for version PKGVER
+ This package provides the various documents in the PKGVER kernel
+ Documentation/ subdirectory.  These document kernel subsystems, APIs, device
+ drivers, and so on.  See
+ /usr/share/doc/SRCPKGNAME-doc/00-INDEX for a list of what is
+ contained in each file.
diff --git a/debian/rules b/debian/rules
index 47cbe03de04f..d35898ce2747 100755
--- a/debian/rules
+++ b/debian/rules
@@ -179,6 +179,9 @@ control_files := $(DEBIAN)/control.stub.in
 ifeq ($(do_libc_dev_package),true)
  control_files += $(DROOT)/control.d/linux-libc-dev.stub
 endif
+ifeq ($(do_doc_package),true)
+ control_files += $(DROOT)/control.d/linux-doc.stub
+endif
 
 # Misc stuff
 .PHONY: $(DEBIAN)/control.stub
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 37574fbbdfde..8d02b2d9c6bc 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -152,7 +152,11 @@ indep_hdrs_pkg_name=$(src_pkg_name)-headers-$(abi_release)
 # cycle, so its OK to leave 'do_doc_package_content=false' until those build
 # failures get sorted out. Finally, the doc package doesn't really need to be built
 # for developer testing (its kind of slow), so only do it if on a buildd.
+ifneq ($(filter --,$(variants)),)
 do_doc_package=true
+else
+do_doc_package=false
+endif
 do_doc_package_content=true
 ifeq ($(full_build),false)
 do_doc_package_content=false
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 07/10][linux] UBUNTU: [Packaging] Add debian.master/variants

Seth Forshee
In reply to this post by Seth Forshee
As 5.4 is not ready to be the primary variant, we'll use the -wip
(work in progress) variant for now.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian.master/variants | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 debian.master/variants

diff --git a/debian.master/variants b/debian.master/variants
new file mode 100644
index 000000000000..3662a92b1ebe
--- /dev/null
+++ b/debian.master/variants
@@ -0,0 +1 @@
+-wip
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 08/10][linux] UBUNTU: Start new release

Seth Forshee
In reply to this post by Seth Forshee
Ignore: yes
Signed-off-by: Seth Forshee <[hidden email]>
---
 debian.master/abi/5.4.0-6.7/abiname                       | 1 -
 debian.master/abi/5.4.0-7.8/abiname                       | 1 +
 debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/generic  | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/generic.compiler   | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/generic.modules    | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/generic.retpoline  | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/lowlatency         | 0
 .../{5.4.0-6.7 => 5.4.0-7.8}/amd64/lowlatency.compiler    | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/lowlatency.modules | 0
 .../{5.4.0-6.7 => 5.4.0-7.8}/amd64/lowlatency.retpoline   | 0
 debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/generic  | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/generic.compiler   | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/generic.modules    | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/generic.retpoline  | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/snapdragon         | 0
 .../{5.4.0-6.7 => 5.4.0-7.8}/arm64/snapdragon.compiler    | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/snapdragon.modules | 0
 .../{5.4.0-6.7 => 5.4.0-7.8}/arm64/snapdragon.retpoline   | 0
 debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic  | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic-lpae       | 0
 .../{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic-lpae.compiler  | 0
 .../{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic-lpae.modules   | 0
 .../{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic-lpae.retpoline | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic.compiler   | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic.modules    | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic.retpoline  | 0
 debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/fwinfo         | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/ppc64el/generic          | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/ppc64el/generic.compiler | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/ppc64el/generic.modules  | 0
 .../{5.4.0-6.7 => 5.4.0-7.8}/ppc64el/generic.retpoline    | 0
 debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/s390x/generic  | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/s390x/generic.compiler   | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/s390x/generic.modules    | 0
 .../abi/{5.4.0-6.7 => 5.4.0-7.8}/s390x/generic.retpoline  | 0
 debian.master/changelog                                   | 8 ++++++++
 36 files changed, 9 insertions(+), 1 deletion(-)
 delete mode 100644 debian.master/abi/5.4.0-6.7/abiname
 create mode 100644 debian.master/abi/5.4.0-7.8/abiname
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/generic (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/generic.compiler (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/generic.modules (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/generic.retpoline (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/lowlatency (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/lowlatency.compiler (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/lowlatency.modules (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/amd64/lowlatency.retpoline (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/generic (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/generic.compiler (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/generic.modules (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/generic.retpoline (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/snapdragon (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/snapdragon.compiler (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/snapdragon.modules (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/arm64/snapdragon.retpoline (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic-lpae (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic-lpae.compiler (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic-lpae.modules (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic-lpae.retpoline (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic.compiler (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic.modules (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/armhf/generic.retpoline (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/fwinfo (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/ppc64el/generic (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/ppc64el/generic.compiler (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/ppc64el/generic.modules (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/ppc64el/generic.retpoline (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/s390x/generic (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/s390x/generic.compiler (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/s390x/generic.modules (100%)
 rename debian.master/abi/{5.4.0-6.7 => 5.4.0-7.8}/s390x/generic.retpoline (100%)

diff --git a/debian.master/abi/5.4.0-6.7/abiname b/debian.master/abi/5.4.0-6.7/abiname
deleted file mode 100644
index 1e8b31496214..000000000000
--- a/debian.master/abi/5.4.0-6.7/abiname
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/debian.master/abi/5.4.0-7.8/abiname b/debian.master/abi/5.4.0-7.8/abiname
new file mode 100644
index 000000000000..7f8f011eb73d
--- /dev/null
+++ b/debian.master/abi/5.4.0-7.8/abiname
@@ -0,0 +1 @@
+7
diff --git a/debian.master/abi/5.4.0-6.7/amd64/generic b/debian.master/abi/5.4.0-7.8/amd64/generic
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/amd64/generic
rename to debian.master/abi/5.4.0-7.8/amd64/generic
diff --git a/debian.master/abi/5.4.0-6.7/amd64/generic.compiler b/debian.master/abi/5.4.0-7.8/amd64/generic.compiler
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/amd64/generic.compiler
rename to debian.master/abi/5.4.0-7.8/amd64/generic.compiler
diff --git a/debian.master/abi/5.4.0-6.7/amd64/generic.modules b/debian.master/abi/5.4.0-7.8/amd64/generic.modules
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/amd64/generic.modules
rename to debian.master/abi/5.4.0-7.8/amd64/generic.modules
diff --git a/debian.master/abi/5.4.0-6.7/amd64/generic.retpoline b/debian.master/abi/5.4.0-7.8/amd64/generic.retpoline
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/amd64/generic.retpoline
rename to debian.master/abi/5.4.0-7.8/amd64/generic.retpoline
diff --git a/debian.master/abi/5.4.0-6.7/amd64/lowlatency b/debian.master/abi/5.4.0-7.8/amd64/lowlatency
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/amd64/lowlatency
rename to debian.master/abi/5.4.0-7.8/amd64/lowlatency
diff --git a/debian.master/abi/5.4.0-6.7/amd64/lowlatency.compiler b/debian.master/abi/5.4.0-7.8/amd64/lowlatency.compiler
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/amd64/lowlatency.compiler
rename to debian.master/abi/5.4.0-7.8/amd64/lowlatency.compiler
diff --git a/debian.master/abi/5.4.0-6.7/amd64/lowlatency.modules b/debian.master/abi/5.4.0-7.8/amd64/lowlatency.modules
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/amd64/lowlatency.modules
rename to debian.master/abi/5.4.0-7.8/amd64/lowlatency.modules
diff --git a/debian.master/abi/5.4.0-6.7/amd64/lowlatency.retpoline b/debian.master/abi/5.4.0-7.8/amd64/lowlatency.retpoline
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/amd64/lowlatency.retpoline
rename to debian.master/abi/5.4.0-7.8/amd64/lowlatency.retpoline
diff --git a/debian.master/abi/5.4.0-6.7/arm64/generic b/debian.master/abi/5.4.0-7.8/arm64/generic
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/arm64/generic
rename to debian.master/abi/5.4.0-7.8/arm64/generic
diff --git a/debian.master/abi/5.4.0-6.7/arm64/generic.compiler b/debian.master/abi/5.4.0-7.8/arm64/generic.compiler
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/arm64/generic.compiler
rename to debian.master/abi/5.4.0-7.8/arm64/generic.compiler
diff --git a/debian.master/abi/5.4.0-6.7/arm64/generic.modules b/debian.master/abi/5.4.0-7.8/arm64/generic.modules
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/arm64/generic.modules
rename to debian.master/abi/5.4.0-7.8/arm64/generic.modules
diff --git a/debian.master/abi/5.4.0-6.7/arm64/generic.retpoline b/debian.master/abi/5.4.0-7.8/arm64/generic.retpoline
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/arm64/generic.retpoline
rename to debian.master/abi/5.4.0-7.8/arm64/generic.retpoline
diff --git a/debian.master/abi/5.4.0-6.7/arm64/snapdragon b/debian.master/abi/5.4.0-7.8/arm64/snapdragon
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/arm64/snapdragon
rename to debian.master/abi/5.4.0-7.8/arm64/snapdragon
diff --git a/debian.master/abi/5.4.0-6.7/arm64/snapdragon.compiler b/debian.master/abi/5.4.0-7.8/arm64/snapdragon.compiler
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/arm64/snapdragon.compiler
rename to debian.master/abi/5.4.0-7.8/arm64/snapdragon.compiler
diff --git a/debian.master/abi/5.4.0-6.7/arm64/snapdragon.modules b/debian.master/abi/5.4.0-7.8/arm64/snapdragon.modules
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/arm64/snapdragon.modules
rename to debian.master/abi/5.4.0-7.8/arm64/snapdragon.modules
diff --git a/debian.master/abi/5.4.0-6.7/arm64/snapdragon.retpoline b/debian.master/abi/5.4.0-7.8/arm64/snapdragon.retpoline
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/arm64/snapdragon.retpoline
rename to debian.master/abi/5.4.0-7.8/arm64/snapdragon.retpoline
diff --git a/debian.master/abi/5.4.0-6.7/armhf/generic b/debian.master/abi/5.4.0-7.8/armhf/generic
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/armhf/generic
rename to debian.master/abi/5.4.0-7.8/armhf/generic
diff --git a/debian.master/abi/5.4.0-6.7/armhf/generic-lpae b/debian.master/abi/5.4.0-7.8/armhf/generic-lpae
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/armhf/generic-lpae
rename to debian.master/abi/5.4.0-7.8/armhf/generic-lpae
diff --git a/debian.master/abi/5.4.0-6.7/armhf/generic-lpae.compiler b/debian.master/abi/5.4.0-7.8/armhf/generic-lpae.compiler
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/armhf/generic-lpae.compiler
rename to debian.master/abi/5.4.0-7.8/armhf/generic-lpae.compiler
diff --git a/debian.master/abi/5.4.0-6.7/armhf/generic-lpae.modules b/debian.master/abi/5.4.0-7.8/armhf/generic-lpae.modules
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/armhf/generic-lpae.modules
rename to debian.master/abi/5.4.0-7.8/armhf/generic-lpae.modules
diff --git a/debian.master/abi/5.4.0-6.7/armhf/generic-lpae.retpoline b/debian.master/abi/5.4.0-7.8/armhf/generic-lpae.retpoline
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/armhf/generic-lpae.retpoline
rename to debian.master/abi/5.4.0-7.8/armhf/generic-lpae.retpoline
diff --git a/debian.master/abi/5.4.0-6.7/armhf/generic.compiler b/debian.master/abi/5.4.0-7.8/armhf/generic.compiler
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/armhf/generic.compiler
rename to debian.master/abi/5.4.0-7.8/armhf/generic.compiler
diff --git a/debian.master/abi/5.4.0-6.7/armhf/generic.modules b/debian.master/abi/5.4.0-7.8/armhf/generic.modules
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/armhf/generic.modules
rename to debian.master/abi/5.4.0-7.8/armhf/generic.modules
diff --git a/debian.master/abi/5.4.0-6.7/armhf/generic.retpoline b/debian.master/abi/5.4.0-7.8/armhf/generic.retpoline
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/armhf/generic.retpoline
rename to debian.master/abi/5.4.0-7.8/armhf/generic.retpoline
diff --git a/debian.master/abi/5.4.0-6.7/fwinfo b/debian.master/abi/5.4.0-7.8/fwinfo
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/fwinfo
rename to debian.master/abi/5.4.0-7.8/fwinfo
diff --git a/debian.master/abi/5.4.0-6.7/ppc64el/generic b/debian.master/abi/5.4.0-7.8/ppc64el/generic
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/ppc64el/generic
rename to debian.master/abi/5.4.0-7.8/ppc64el/generic
diff --git a/debian.master/abi/5.4.0-6.7/ppc64el/generic.compiler b/debian.master/abi/5.4.0-7.8/ppc64el/generic.compiler
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/ppc64el/generic.compiler
rename to debian.master/abi/5.4.0-7.8/ppc64el/generic.compiler
diff --git a/debian.master/abi/5.4.0-6.7/ppc64el/generic.modules b/debian.master/abi/5.4.0-7.8/ppc64el/generic.modules
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/ppc64el/generic.modules
rename to debian.master/abi/5.4.0-7.8/ppc64el/generic.modules
diff --git a/debian.master/abi/5.4.0-6.7/ppc64el/generic.retpoline b/debian.master/abi/5.4.0-7.8/ppc64el/generic.retpoline
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/ppc64el/generic.retpoline
rename to debian.master/abi/5.4.0-7.8/ppc64el/generic.retpoline
diff --git a/debian.master/abi/5.4.0-6.7/s390x/generic b/debian.master/abi/5.4.0-7.8/s390x/generic
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/s390x/generic
rename to debian.master/abi/5.4.0-7.8/s390x/generic
diff --git a/debian.master/abi/5.4.0-6.7/s390x/generic.compiler b/debian.master/abi/5.4.0-7.8/s390x/generic.compiler
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/s390x/generic.compiler
rename to debian.master/abi/5.4.0-7.8/s390x/generic.compiler
diff --git a/debian.master/abi/5.4.0-6.7/s390x/generic.modules b/debian.master/abi/5.4.0-7.8/s390x/generic.modules
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/s390x/generic.modules
rename to debian.master/abi/5.4.0-7.8/s390x/generic.modules
diff --git a/debian.master/abi/5.4.0-6.7/s390x/generic.retpoline b/debian.master/abi/5.4.0-7.8/s390x/generic.retpoline
similarity index 100%
rename from debian.master/abi/5.4.0-6.7/s390x/generic.retpoline
rename to debian.master/abi/5.4.0-7.8/s390x/generic.retpoline
diff --git a/debian.master/changelog b/debian.master/changelog
index 8d2720185244..f5c4d80e5cf3 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,3 +1,11 @@
+linux (5.4.0-8.9) UNRELEASED; urgency=medium
+
+  CHANGELOG: Do not edit directly. Autogenerated at release.
+  CHANGELOG: Use the printchanges target to see the curent changes.
+  CHANGELOG: Use the insertchanges target to create the final log.
+
+ -- Seth Forshee <[hidden email]>  Tue, 26 Nov 2019 07:25:51 -0600
+
 linux (5.4.0-7.8) focal; urgency=medium
 
   * Miscellaneous Ubuntu changes
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 09/10][linux] UBUNTU: [Packaging] Change source package to linux-5.4

Seth Forshee
In reply to this post by Seth Forshee
Signed-off-by: Seth Forshee <[hidden email]>
---
 debian.master/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian.master/changelog b/debian.master/changelog
index f5c4d80e5cf3..a9ecd4b5871e 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,4 +1,4 @@
-linux (5.4.0-8.9) UNRELEASED; urgency=medium
+linux-5.4 (5.4.0-8.9) UNRELEASED; urgency=medium
 
   CHANGELOG: Do not edit directly. Autogenerated at release.
   CHANGELOG: Use the printchanges target to see the curent changes.
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 10/10][linux] UBUNTU: [Debian] Update linux source package name in debian/tests/*

Seth Forshee
In reply to this post by Seth Forshee
Change test scripts checking for linux as a source package name
to look for linux-[0-9].[0-9] instead to cope with the change
in source package naming.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/tests/rebuild                 | 2 +-
 debian/tests/ubuntu-regression-suite | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/tests/rebuild b/debian/tests/rebuild
index 365835c92d92..49ad5b235603 100755
--- a/debian/tests/rebuild
+++ b/debian/tests/rebuild
@@ -7,7 +7,7 @@ build_needed=0
 for trigger in ${ADT_TEST_TRIGGERS:-force}
 do
  case "$trigger" in
- linux/*|linux-lts-*/*|linux-meta*/*|linux-oem*/*|fakeroot/*|gdb/*|git/*|bzr/*|gcc-multilib/*) ;;
+ linux-[0-9].[0-9]/*|linux-lts-*/*|linux-meta*/*|linux-oem*/*|fakeroot/*|gdb/*|git/*|bzr/*|gcc-multilib/*) ;;
  *) build_needed=1 ;;
  esac
 done
diff --git a/debian/tests/ubuntu-regression-suite b/debian/tests/ubuntu-regression-suite
index 72a95a1e32cd..0e9a2115a74f 100755
--- a/debian/tests/ubuntu-regression-suite
+++ b/debian/tests/ubuntu-regression-suite
@@ -4,7 +4,7 @@ set -e
 # Only run regression-suite on kernels we can boot in canonistack
 source=`dpkg-parsechangelog -SSource`
 case $source in
-    linux|linux-hwe|linux-hwe-edge|linux-kvm|linux-oem)
+    linux-[0-9].[0-9]|linux-hwe|linux-hwe-edge|linux-kvm|linux-oem)
  ;;
     *)
  echo "ubuntu-regression-suite is pointless, if one cannot boot the kernel"
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 1/3][linux-signed] UBUNTU: [Packaging] Set source package name from the changelog

Seth Forshee
In reply to this post by Seth Forshee
To ease transitioning the source package name, set the name in
the control file from the name in the topmost changelog entry.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/control.stub | 2 +-
 debian/rules        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/control.stub b/debian/control.stub
index f91e9976f401..cada6c9a795b 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -1,4 +1,4 @@
-Source: linux-signed
+Source: SIGNED_SRC_PACKAGE
 Section: kernel
 Priority: optional
 Maintainer: Canonical Kernel Team <[hidden email]>
diff --git a/debian/rules b/debian/rules
index 2af6d4f6d5c8..743f764fb284 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,8 @@ pre-clean:
  sed <debian/control.stub >debian/control \
  -e "s/ABI/$(abi)/g" \
  -e "s/UNSIGNED_SRC_PACKAGE/$(unsigned_src)/g" \
- -e "s/UNSIGNED_SRC_VERSION/$(unsigned_ver)/g"
+ -e "s/UNSIGNED_SRC_VERSION/$(unsigned_ver)/g" \
+ -e 's/SIGNED_SRC_PACKAGE/$(src)/g'
  rm -rf ./$(unsigned_ver) UNSIGNED SIGNED
  rm -f debian/linux-image-*.install \
  debian/linux-image-*.preinst \
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 2/3][linux-signed] UBUNTU: [Packaging] Depend on header packages rather than linux-libc-dev

Seth Forshee
In reply to this post by Seth Forshee
Since we will not produce linux-libc-dev when not building for
the primary variant we can no longer use it as a build dependency
to indicate that the arch kernel build is complete. Instead,
depend on the per-arch headers package and the common headers
package required for the per-arch package to install, and use the
header package for download-signed.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/control.stub |  3 ++-
 debian/rules        | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/control.stub b/debian/control.stub
index cada6c9a795b..c39e9c301600 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -9,7 +9,8 @@ Build-Depends:
  python3-apt,
 Build-Depends-Arch:
  sbsigntool [amd64 arm64],
- linux-libc-dev (>= UNSIGNED_SRC_VERSION),
+ HEADERS_COMMON (>= UNSIGNED_SRC_VERSION),
+ HEADERS_ARCH (>= UNSIGNED_SRC_VERSION),
 Standards-Version: 3.9.4
 
 Package: linux-image-ABI-generic
diff --git a/debian/rules b/debian/rules
index 743f764fb284..f12937bd59d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,12 @@ abi = $(shell echo "$(ver)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/
 unsigned_src = $(shell echo $(src) | sed -e 's/-signed//')
 unsigned_ver = $(shell echo $(ver) | sed -e 's/+[0-9][0-9]*//')
 
+# Work out header packges for build deps. Depend on the common header
+# package and the per-arch generic headers package (assumes all arches
+# have a generic flavour, which is currently true).
+src_headers = $(unsigned_src)-headers-$(abi)
+src_headers_arch = linux-headers-$(abi)-generic
+
 # We build our control file.  This has to be done before dh runs otherwise
 # we have no binary files and we will not run the appropriate targets.
 pre-clean:
@@ -21,7 +27,9 @@ pre-clean:
  -e "s/ABI/$(abi)/g" \
  -e "s/UNSIGNED_SRC_PACKAGE/$(unsigned_src)/g" \
  -e "s/UNSIGNED_SRC_VERSION/$(unsigned_ver)/g" \
- -e 's/SIGNED_SRC_PACKAGE/$(src)/g'
+ -e 's/SIGNED_SRC_PACKAGE/$(src)/g' \
+ -e 's/HEADERS_COMMON/$(src_headers)/g' \
+ -e 's/HEADERS_ARCH/$(src_headers_arch)/g'
  rm -rf ./$(unsigned_ver) UNSIGNED SIGNED
  rm -f debian/linux-image-*.install \
  debian/linux-image-*.preinst \
@@ -38,7 +46,7 @@ clean:: pre-clean
  dh $@
 
 override_dh_auto_build:
- ./download-signed "linux-libc-dev" "$(unsigned_ver)" "$(unsigned_src)"
+ ./download-signed "$(src_headers_arch)" "$(unsigned_ver)" "$(unsigned_src)"
  #./download-unsigned "$(DEB_HOST_ARCH)" "$(unsigned_ver)"
  mkdir SIGNED
  ( \
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 3/3][linux-signed] UBUNTU: [Packaging] update variants

Seth Forshee
In reply to this post by Seth Forshee
BugLink: http://bugs.launchpad.net/bugs/1786013
Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/variants | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 debian/variants

diff --git a/debian/variants b/debian/variants
new file mode 100644
index 000000000000..3662a92b1ebe
--- /dev/null
+++ b/debian/variants
@@ -0,0 +1 @@
+-wip
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 1/4][linux-meta] UBUNTU: [Debian] Remove unused generic-depends substitution

Seth Forshee
In reply to this post by Seth Forshee
Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/rules | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 78bd3cf2a73f..77225d74ad17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,12 +27,6 @@ KERNEL_ABI=$(shell head -n1 < debian/changelog | gawk '{n=split($$0,v,"."); prin
 
 KERNEL_ABI_VERSION=$(KERNEL_VERSION)-$(KERNEL_ABI)
 
-GENERIC_amd64=generic
-GENERIC_armhf=generic
-
-GENERIC=$(value GENERIC_$(shell dpkg-architecture -qDEB_HOST_ARCH))
-GENERIC_DEP=$(if $(GENERIC),$(GENERIC),)
-
 control_files := debian/control.common $(shell LC_ALL=C ls -d debian/control.d/*)
 
 SHELL := sh -e
@@ -59,7 +53,6 @@ debian/control: $(control_files)
 
 gencontrol_flags = -Vkernel-version=$(KERNEL_VERSION)
 gencontrol_flags += -Vkernel-abi-version=$(KERNEL_ABI_VERSION)
-gencontrol_flags += -Vgeneric-depends=$(GENERIC_DEP)
 
 build-%:
  :
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 2/4][linux-meta] UBUNTU: [Debian] Simplify getting kernel version and abi

Seth Forshee
In reply to this post by Seth Forshee
Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/rules | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 77225d74ad17..9ddcb3bb5f91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,8 @@ SOURCE=$(shell dpkg-parsechangelog | sed -ne 's/^Source: *//p')
 SUFFIX=$(shell dpkg-parsechangelog | sed -ne 's/^Source: *linux-meta-lts/-lts/p')
 
 # 5 digit versions (2.6.38.<abi>.<upload>, 3 digit kernel base versions (2.6.38)
-KERNEL_VERSION=$(shell dpkg-parsechangelog | grep ^Version | sed -e \
- 's/Version: \([0-9]*\.[0-9]*\.[0-9]*\)\..*/\1/')
-KERNEL_ABI=$(shell head -n1 < debian/changelog | gawk '{n=split($$0,v,"."); print v[4];}')
+KERNEL_VERSION=$(shell dpkg-parsechangelog -SVersion | cut -d. -f1-3)
+KERNEL_ABI=$(shell dpkg-parsechangelog -SVersion | cut -d. -f4)
 
 # 4 digit versions (3.0.<abi>.<upload>), 2 digit kernel base versions (3.0)
 #KERNEL_VERSION=$(shell dpkg-parsechangelog | grep ^Version | sed -e \
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 3/4][linux-meta] UBUNTU: [Debian] Use variant information to generate debian/control

Seth Forshee
In reply to this post by Seth Forshee
Use the variant list from debian/variants to generate meta
packages for all variants imported from the kernel. While at it,
update the syntax used for variable substitution in the control
templates for consistency. If no debian/variants files is
present, assume the primary variant.

linux-source and linux-crashdump should only be generated for the
primary (i.e. "--") variant. Move these to
debian/control.d/primary so that they can be omitted whenever the
primary variant is not present.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/control.common         | 25 ++-------------
 debian/control.d/generic      | 12 ++++----
 debian/control.d/generic-lpae | 10 +++---
 debian/control.d/lowlatency   | 12 ++++----
 debian/control.d/primary      | 19 ++++++++++++
 debian/control.d/snapdragon   | 10 +++---
 debian/control.d/virtual      | 18 +++++------
 debian/rules                  | 57 +++++++++++++++++++++++------------
 8 files changed, 89 insertions(+), 74 deletions(-)
 create mode 100644 debian/control.d/primary

diff --git a/debian/control.common b/debian/control.common
index 2c05c0c9838b..fbe34ac6c7c2 100644
--- a/debian/control.common
+++ b/debian/control.common
@@ -1,31 +1,10 @@
-Source: linux-meta@SUFFIX@
+Source: @META_SOURCE@
 Section: devel
 Priority: optional
 Maintainer: Ubuntu Kernel Team <[hidden email]>
 Standards-Version: 3.9.8
 Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk,
 Build-Depends-Arch:
- linux-headers-@kernel-abi-version@,
+ @KERNEL_SOURCE@-headers-@kernel-abi-version@,
  linux-headers-@kernel-abi-version@-generic,
 Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta/+git/@SERIES@
-
-Package: linux-source@SUFFIX@
-Architecture: all
-Depends: ${misc:Depends}, linux-source-${kernel-version}
-Description: Linux kernel source with Ubuntu patches
- This package will always depend on the latest Linux kernel source code
- available. The Ubuntu patches have been applied.
-
-Package: linux-crashdump@SUFFIX@
-Architecture: amd64 arm64 armhf ppc64el s390x
-Depends: ${misc:Depends}, kdump-tools, grub-pc (>= 1.96+20090611-1ubuntu2) [amd64] | grub-efi-ia32 [amd64] | grub-efi-amd64 [amd64] | grub-efi-arm64 [arm64] | grub (>= 0.97-29ubuntu24) [amd64]
-Recommends: apport
-Suggests: crash
-Description: Linux kernel crashdump setup for the latest generic kernel
- This package installs all the needed infrastructure to get crashdumps from
- your running system. If you are experiencing kernel crashes that cannot
- be debugged normally (because the problem is infrequent or panic's the
- system in such a way as to make information gathering impossible), then
- you can install this package to automatically enable capture of the
- vmcore on crashes.
-
diff --git a/debian/control.d/generic b/debian/control.d/generic
index 7be251a69cee..a548f360a5b6 100644
--- a/debian/control.d/generic
+++ b/debian/control.d/generic
@@ -1,4 +1,4 @@
-Package: linux-headers-generic@SUFFIX@
+Package: linux-headers-generic${variant:suffix}
 Architecture: amd64 armhf arm64 powerpc ppc64el s390x
 Section: kernel
 Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic
@@ -6,7 +6,7 @@ Description: Generic Linux kernel headers
  This package will always depend on the latest generic kernel headers
  available.
 
-Package: linux-image-generic@SUFFIX@
+Package: linux-image-generic${variant:suffix}
 Architecture: amd64 armhf arm64 powerpc ppc64el s390x
 Section: kernel
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic, linux-modules-extra-${kernel-abi-version}-generic [amd64 arm64 powerpc ppc64el s390x], linux-firmware, intel-microcode [amd64], amd64-microcode [amd64]
@@ -15,7 +15,7 @@ Description: Generic Linux kernel image
  This package will always depend on the latest generic kernel image
  available.
 
-Package: linux-tools-generic@SUFFIX@
+Package: linux-tools-generic${variant:suffix}
 Architecture: amd64 armhf arm64 powerpc ppc64el s390x
 Section: kernel
 Provides: linux-tools
@@ -24,7 +24,7 @@ Description: Generic Linux kernel tools
  This package will always depend on the latest generic kernel tools
  available.
 
-Package: linux-cloud-tools-generic@SUFFIX@
+Package: linux-cloud-tools-generic${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: linux-cloud-tools
@@ -33,10 +33,10 @@ Description: Generic Linux kernel cloud tools
  This package will always depend on the latest generic kernel cloud tools
  available.
 
-Package: linux-generic@SUFFIX@
+Package: linux-generic${variant:suffix}
 Architecture: amd64 armhf arm64 powerpc ppc64el s390x
 Section: kernel
-Depends: ${misc:Depends}, linux-image-generic@SUFFIX@ (= ${binary:Version}), linux-headers-generic@SUFFIX@ (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-generic${variant:suffix} (= ${binary:Version}), linux-headers-generic${variant:suffix} (= ${binary:Version})
 Description: Complete Generic Linux kernel and headers
  This package will always depend on the latest complete generic Linux kernel
  and headers.
diff --git a/debian/control.d/generic-lpae b/debian/control.d/generic-lpae
index 2a4d72dbfd35..f8c57d8fcb12 100644
--- a/debian/control.d/generic-lpae
+++ b/debian/control.d/generic-lpae
@@ -1,4 +1,4 @@
-Package: linux-headers-generic-lpae@SUFFIX@
+Package: linux-headers-generic-lpae${variant:suffix}
 Architecture: armhf
 Section: kernel
 Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic-lpae
@@ -6,7 +6,7 @@ Description: Generic LPAE Linux kernel headers
  This package will always depend on the latest generic-lpae kernel headers
  available.
 
-Package: linux-image-generic-lpae@SUFFIX@
+Package: linux-image-generic-lpae${variant:suffix}
 Architecture: armhf
 Section: kernel
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic-lpae, linux-firmware
@@ -15,7 +15,7 @@ Description: Generic LPAE Linux kernel image
  This package will always depend on the latest generic-lpae kernel image
  available.
 
-Package: linux-tools-generic-lpae@SUFFIX@
+Package: linux-tools-generic-lpae${variant:suffix}
 Architecture: armhf
 Section: kernel
 Provides: linux-tools
@@ -24,10 +24,10 @@ Description: Generic LPAE Linux kernel tools
  This package will always depend on the latest generic-lpae kernel tools
  available.
 
-Package: linux-generic-lpae@SUFFIX@
+Package: linux-generic-lpae${variant:suffix}
 Architecture: armhf
 Section: kernel
-Depends: ${misc:Depends}, linux-image-generic-lpae@SUFFIX@ (= ${binary:Version}), linux-headers-generic-lpae@SUFFIX@ (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-generic-lpae${variant:suffix} (= ${binary:Version}), linux-headers-generic-lpae${variant:suffix} (= ${binary:Version})
 Description: Complete Generic LPAE Linux kernel and headers
  This package will always depend on the latest complete generic-lpae Linux kernel
  and headers.
diff --git a/debian/control.d/lowlatency b/debian/control.d/lowlatency
index 0e780155fda4..c8fc888d4055 100644
--- a/debian/control.d/lowlatency
+++ b/debian/control.d/lowlatency
@@ -1,4 +1,4 @@
-Package: linux-headers-lowlatency@SUFFIX@
+Package: linux-headers-lowlatency${variant:suffix}
 Architecture: amd64
 Section: kernel
 Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-lowlatency
@@ -6,7 +6,7 @@ Description: lowlatency Linux kernel headers
  This package will always depend on the latest lowlatency kernel headers
  available.
 
-Package: linux-image-lowlatency@SUFFIX@
+Package: linux-image-lowlatency${variant:suffix}
 Architecture: amd64
 Section: kernel
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-lowlatency, linux-firmware, intel-microcode [amd64], amd64-microcode [amd64]
@@ -15,7 +15,7 @@ Description: lowlatency Linux kernel image
  This package will always depend on the latest lowlatency kernel image
  available.
 
-Package: linux-tools-lowlatency@SUFFIX@
+Package: linux-tools-lowlatency${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: linux-tools
@@ -24,7 +24,7 @@ Description: lowlatency Linux kernel tools
  This package will always depend on the latest lowlatency kernel tools
  available.
 
-Package: linux-cloud-tools-lowlatency@SUFFIX@
+Package: linux-cloud-tools-lowlatency${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: linux-cloud-tools
@@ -33,10 +33,10 @@ Description: lowlatency Linux kernel cloud tools
  This package will always depend on the latest lowlatency kernel cloud tools
  available.
 
-Package: linux-lowlatency@SUFFIX@
+Package: linux-lowlatency${variant:suffix}
 Architecture: amd64
 Section: kernel
-Depends: ${misc:Depends}, linux-image-lowlatency@SUFFIX@ (= ${binary:Version}), linux-headers-lowlatency@SUFFIX@ (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-lowlatency${variant:suffix} (= ${binary:Version}), linux-headers-lowlatency${variant:suffix} (= ${binary:Version})
 Description: Complete lowlatency Linux kernel
  This package will always depend on the latest complete lowlatency Linux kernel
  available.
diff --git a/debian/control.d/primary b/debian/control.d/primary
new file mode 100644
index 000000000000..de20d4b1e39a
--- /dev/null
+++ b/debian/control.d/primary
@@ -0,0 +1,19 @@
+Package: linux-source
+Architecture: all
+Depends: ${misc:Depends}, linux-source-${kernel-version}
+Description: Linux kernel source with Ubuntu patches
+ This package will always depend on the latest Linux kernel source code
+ available. The Ubuntu patches have been applied.
+
+Package: linux-crashdump
+Architecture: amd64 arm64 armhf ppc64el s390x
+Depends: ${misc:Depends}, kdump-tools, grub-pc (>= 1.96+20090611-1ubuntu2) [amd64] | grub-efi-ia32 [amd64] | grub-efi-amd64 [amd64] | grub-efi-arm64 [arm64] | grub (>= 0.97-29ubuntu24) [amd64]
+Recommends: apport
+Suggests: crash
+Description: Linux kernel crashdump setup for the latest generic kernel
+ This package installs all the needed infrastructure to get crashdumps from
+ your running system. If you are experiencing kernel crashes that cannot
+ be debugged normally (because the problem is infrequent or panic's the
+ system in such a way as to make information gathering impossible), then
+ you can install this package to automatically enable capture of the
+ vmcore on crashes.
diff --git a/debian/control.d/snapdragon b/debian/control.d/snapdragon
index 2645922490e9..34b7b3bba934 100644
--- a/debian/control.d/snapdragon
+++ b/debian/control.d/snapdragon
@@ -1,4 +1,4 @@
-Package: linux-headers-snapdragon@SUFFIX@
+Package: linux-headers-snapdragon${variant:suffix}
 Architecture: arm64
 Section: kernel
 Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-snapdragon
@@ -6,7 +6,7 @@ Description: Linux kernel headers for the Qualcomm Snapdragon 410c architecture
  This package will always depend on the latest kernel headers available
  for ARM64 Qualcomm Snapdragon 410c systems.
 
-Package: linux-image-snapdragon@SUFFIX@
+Package: linux-image-snapdragon${variant:suffix}
 Architecture: arm64
 Section: kernel
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-snapdragon, linux-firmware
@@ -14,7 +14,7 @@ Description: Linux kernel image for the Qualcomm Snapdragon 410c architecture
  This package will always depend on the latest kernel image available
  for ARM64 Qualcomm Snapdragon 410c systems.
 
-Package: linux-tools-snapdragon@SUFFIX@
+Package: linux-tools-snapdragon${variant:suffix}
 Architecture: arm64
 Section: kernel
 Provides: linux-tools
@@ -23,10 +23,10 @@ Description: Linux kernel tools for the Qualcomm Snapdragon 410c architecture
  This package will always depend on the latest kernel tools available
  for ARM64 Qualcomm Snapdragon 410c systems.
 
-Package: linux-snapdragon@SUFFIX@
+Package: linux-snapdragon${variant:suffix}
 Architecture: arm64
 Section: kernel
-Depends: ${misc:Depends}, linux-image-snapdragon@SUFFIX@ (= ${binary:Version}), linux-headers-snapdragon@SUFFIX@ (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-snapdragon${variant:suffix} (= ${binary:Version}), linux-headers-snapdragon${variant:suffix} (= ${binary:Version})
 Description: Complete Linux kernel and headers for the Qualcomm Snapdragon 410c architecture
  This package will always depend on the latest complete Linux kernel and
  headers available for ARM64 Qualcomm Snapdragon 410c systems.
diff --git a/debian/control.d/virtual b/debian/control.d/virtual
index 121c0f08ccea..f0d01c2c6f4b 100644
--- a/debian/control.d/virtual
+++ b/debian/control.d/virtual
@@ -1,11 +1,11 @@
-Package: linux-headers-virtual@SUFFIX@
+Package: linux-headers-virtual${variant:suffix}
 Architecture: amd64 arm64 powerpc ppc64el s390x
 Section: kernel
-Depends: ${misc:Depends}, linux-headers-generic@SUFFIX@ (= ${binary:Version})
+Depends: ${misc:Depends}, linux-headers-generic${variant:suffix} (= ${binary:Version})
 Description: Virtual Linux kernel headers
  This package will always depend on linux-headers-generic.
 
-Package: linux-image-virtual@SUFFIX@
+Package: linux-image-virtual${variant:suffix}
 Architecture: amd64 arm64 powerpc ppc64el s390x
 Section: kernel
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic
@@ -13,7 +13,7 @@ Description: Virtual Linux kernel image
  This package will always depend on the latest minimal generic kernel image
  used for virtual instances.
 
-Package: linux-tools-virtual@SUFFIX@
+Package: linux-tools-virtual${variant:suffix}
 Architecture: amd64 arm64 powerpc ppc64el s390x
 Section: kernel
 Provides: linux-tools
@@ -22,7 +22,7 @@ Description: Virtual Linux kernel tools
  This package will always depend on the latest minimal generic kernel tools
  used for virtual instances.
 
-Package: linux-cloud-tools-virtual@SUFFIX@
+Package: linux-cloud-tools-virtual${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: linux-cloud-tools
@@ -31,17 +31,17 @@ Description: Virtual Linux kernel cloud tools
  This package will always depend on the latest minimal generic kernel cloud tools
  used for virtual instances.
 
-Package: linux-virtual@SUFFIX@
+Package: linux-virtual${variant:suffix}
 Architecture: amd64 arm64 powerpc ppc64el s390x
 Section: kernel
-Depends: ${misc:Depends}, linux-image-virtual@SUFFIX@ (= ${binary:Version}), linux-headers-virtual@SUFFIX@ (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-virtual${variant:suffix} (= ${binary:Version}), linux-headers-virtual${variant:suffix} (= ${binary:Version})
 Description: Minimal Generic Linux kernel and headers
  This package will always depend on linux-image-virtual and
  linux-headers-virtual.
 
-Package: linux-image-extra-virtual@SUFFIX@
+Package: linux-image-extra-virtual${variant:suffix}
 Architecture: amd64 arm64 powerpc ppc64el s390x
 Section: kernel
-Depends: ${misc:Depends}, linux-image-generic@SUFFIX@ (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-generic${variant:suffix} (= ${binary:Version})
 Description: Extra drivers for Virtual Linux kernel image
  This package will always depend on linux-image-generic.
diff --git a/debian/rules b/debian/rules
index 9ddcb3bb5f91..6419ebc4228c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,26 +7,31 @@
 # Copyright (c) 2004 Jens Schmalzing <[hidden email]>
 #
 
-# Pull out the source suffix, we intend to maintain an -lts-<series> suffix
-# but otherwise assume this main packages are not intended to have a suffix
-# so that linux-meta and linux-meta-ti-omap4 will behave normally, but
-# linux-meta-lts-vivid will add the series suffix.
 SERIES=$(shell dpkg-parsechangelog | sed -ne 's/^Distribution: *//p' | sed -e 's/-\(security\|updates\|proposed\)$$//')
 SOURCE=$(shell dpkg-parsechangelog | sed -ne 's/^Source: *//p')
-SUFFIX=$(shell dpkg-parsechangelog | sed -ne 's/^Source: *linux-meta-lts/-lts/p')
+KERNEL_SOURCE=$(shell echo "$(SOURCE)" | sed -e 's/-meta//')
+
+VARIANT_PROVIDES=$(shell echo "$(SOURCE)" | sed -e 's/linux-meta-//')
 
 # 5 digit versions (2.6.38.<abi>.<upload>, 3 digit kernel base versions (2.6.38)
 KERNEL_VERSION=$(shell dpkg-parsechangelog -SVersion | cut -d. -f1-3)
 KERNEL_ABI=$(shell dpkg-parsechangelog -SVersion | cut -d. -f4)
 
-# 4 digit versions (3.0.<abi>.<upload>), 2 digit kernel base versions (3.0)
-#KERNEL_VERSION=$(shell dpkg-parsechangelog | grep ^Version | sed -e \
- 's/Version: \([0-9]*\.[0-9]*\)\..*/\1/')
-#KERNEL_ABI=$(shell head -n1 < debian/changelog | gawk '{n=split($$0,v,"."); print v[3];}')
-
 KERNEL_ABI_VERSION=$(KERNEL_VERSION)-$(KERNEL_ABI)
 
-control_files := debian/control.common $(shell LC_ALL=C ls -d debian/control.d/*)
+# Get variants, assumng primary if debian/variants is not present
+variants = --
+ifneq (,$(wildcard debian/variants))
+ variants := $(shell cat debian/variants)
+endif
+
+control_files := debian/control.common
+# control files only wanted for the primary variant
+primary_control_files := debian/control.d/primary $(shell LC_ALL=C ls -d debian/control.d/transitionals-*)
+ifneq ($(filter --,$(variants)),)
+ control_files += $(primary_control_files)
+endif
+control_files += $(filter-out $(primary_control_files),$(shell LC_ALL=C ls -d debian/control.d/*))
 
 SHELL := sh -e
 
@@ -35,18 +40,30 @@ clean: debian/control
  dh_testroot
  dh_clean
 
+define variant_payload
+variant="$$(echo '$(variant)' | sed -e 's/--//')"; \
+sed -e "s/\$${variant:suffix}/$$variant/g" -e "s/\$${variant:provides\(\|-image\|-headers\)}/$${variant_provides:+linux\1-$$variant_provides}/" <$$i; \
+variant_provides=''; \
+echo "";
+endef
+
 debian/control: $(control_files)
- rm -f debian/control.tmp
  for i in $^; do \
- sed \
- -e 's/@SERIES@/$(SERIES)/g' \
- -e 's/@SUFFIX@/$(SUFFIX)/g' \
- -e 's/@kernel-abi-version@/$(KERNEL_ABI_VERSION)/g' \
- $$i >> debian/control.tmp; \
- echo >> debian/control.tmp; \
- done
+ if grep -q "{variant:" $$i; then \
+ variant_provides="$(VARIANT_PROVIDES)"; \
+ $(foreach variant,$(variants),$(variant_payload)) \
+ else \
+ cat $$i; \
+ echo ""; \
+ fi; \
+ done | sed \
+ -e 's/@SERIES@/$(SERIES)/g' \
+ -e 's/@kernel-abi-version@/$(KERNEL_ABI_VERSION)/g' \
+ -e 's/@META_SOURCE@/$(SOURCE)/g' \
+ -e 's/@KERNEL_SOURCE@/$(KERNEL_SOURCE)/g' \
+    >$@.tmp
  rm -f $@
- mv debian/control.tmp $@
+ mv $@.tmp $@
 
 .PHONY: debian/control
 
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 4/4][linux-meta] UBUNTU: [Packaging] update variants

Seth Forshee
In reply to this post by Seth Forshee
BugLink: http://bugs.launchpad.net/bugs/1786013
Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/variants | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 debian/variants

diff --git a/debian/variants b/debian/variants
new file mode 100644
index 000000000000..3662a92b1ebe
--- /dev/null
+++ b/debian/variants
@@ -0,0 +1 @@
+-wip
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 1/6][linux-restricted-modules] UBUNTU: [Debian] Fix phony target in debian/rules

Seth Forshee
In reply to this post by Seth Forshee
Target should be named .PHONY, not PHONY.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 41b42889ee64..6b70c81db4f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ pre-clean:
  debian/linux-modules-*.postrm
  rm -rf $(dkms_dir)
 
-PHONY: pre-clean
+.PHONY: pre-clean
 
 debian/scripts/fix-filenames: debian/scripts/fix-filenames.c
  cc -o $@ $^
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[REVIEW 2/6][linux-restricted-modules] UBUNTU: [Packaging] Set source package name from the changelog

Seth Forshee
In reply to this post by Seth Forshee
To ease transitioning the source package name, set the name in
the control file from the name in the topmost changelog entry.
Since the src_package variable in debian/rules is unused, change
it to be the source package name from the changelog. While there,
simplify getting the source package name from the changelog.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/control.stub | 2 +-
 debian/rules        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/control.stub b/debian/control.stub
index d17aff672943..b8f26eb6d409 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -1,4 +1,4 @@
-Source: linux-restricted-modules
+Source: LRM_SOURCE
 Section: utils
 Priority: optional
 Maintainer: Canonical Kernel Team <[hidden email]>
diff --git a/debian/rules b/debian/rules
index 6b70c81db4f8..84a306ef10b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ arch = $(shell dpkg-architecture -qDEB_HOST_ARCH)
 # Work out the source package name and version.  We assume the source package
 # is the name of this package with -restricted-modules stripped.  The version
 # is identical to this package less any rebuild suffix (+lrmN).
-src_package := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Source: | cut -d ' ' -f 2 | sed -e 's/-restricted-modules//')
+src_package := $(shell LC_ALL=C dpkg-parsechangelog -S Source)
 src_fullversion = $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
 src_abi = $(shell echo "$(src_fullversion)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p')
 src_version = $(shell echo $(src_fullversion) | sed -e 's/+[0-9][0-9]*//')
@@ -24,6 +24,7 @@ test:
 # we have no binary files and we will not run the appropriate targets.
 pre-clean:
  sed <debian/control.stub >debian/control \
+ -e 's/LRM_SOURCE/$(src_package)/g' \
  -e "s/ABI/$(src_abi)/g" \
  -e "s/VERSION/$(src_version)/g" \
  -e "s/@SERIES@/$(series)/g"
--
2.24.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
12