diff mbox

[v2,0/5,linux-signed,Unstable,Eoan] debian/rules cleanup

Message ID 20190604225625.15658-1-dann.frazier@canonical.com
State New
Headers show

Commit Message

dann frazier June 4, 2019, 10:56 p.m. UTC 
While working on the changes to fix the Built-Using field, I got the itch
to do some additional cleanup. These changes are just for readability,
so don't qualify for an SRU. Verified by confirming that the generated
debian/control is identical before & after these changes.

I further tested by creating the ppa ppa:dannf/linux-signed w/ a dependency on
ppa:canonical-kernel-team/unstable and uploaded a linux-signed package
there with these changes applied. I then spot-checked the resulting amd64
linux-image deb by comparing it with the ckt/unstable counterpart deb by
unpacking the files (dpkg-deb -x) and metadata (dpkg-deb -e) and comparing.
The differences are below, containing nothing unexpected:

Files:
$ diff -urpN orig/ new/
Binary files orig/usr/share/doc/linux-image-5.2.0-3-generic/changelog.Debian.gz and new/usr/share/doc/linux-image-5.2.0-3-generic/changelog.Debian.gz differ

Control:
$ diff -urpN orig-e/ new-e/

v2:
 - Patch 5 uintentionally reintroduced LC_ALL=C hardcoding; fix.
 - Patch 5 used incorrect unsigned src package var when downloading
   linux-libc-dev; fix.

dann frazier (5):
  UBUNTU: Remove commented out/unused VERSION variable
  UBUNTU: Use dpkg-parsechangelog -S instead of piping to grep/cut
  UBUNTU: Don't see LC_ALL=C when calling dpkg-parsechangelog
  UBUNTU: Change one-off ":=" to a "=" for consistency
  UBUNTU: Rename variables to distinguish signed vs. unsigned metadata

 debian/rules | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

Comments

Seth Forshee June 7, 2019, 8:27 p.m. UTC | #1 
On Tue, Jun 04, 2019 at 04:56:20PM -0600, dann frazier wrote:
> While working on the changes to fix the Built-Using field, I got the itch
> to do some additional cleanup. These changes are just for readability,
> so don't qualify for an SRU. Verified by confirming that the generated
> debian/control is identical before & after these changes.
> 
> I further tested by creating the ppa ppa:dannf/linux-signed w/ a dependency on
> ppa:canonical-kernel-team/unstable and uploaded a linux-signed package
> there with these changes applied. I then spot-checked the resulting amd64
> linux-image deb by comparing it with the ckt/unstable counterpart deb by
> unpacking the files (dpkg-deb -x) and metadata (dpkg-deb -e) and comparing.
> The differences are below, containing nothing unexpected:

Applied to unstable, thanks!
diff mbox

Patch

diff -urpN orig-e/control new-e/control
--- orig-e/control	2019-06-02 21:57:06.000000000 -0600
+++ new-e/control	2019-06-04 16:09:14.000000000 -0600
@@ -1,6 +1,6 @@ 
 Package: linux-image-5.2.0-3-generic
 Source: linux-signed
-Version: 5.2.0-3.4
+Version: 5.2.0-3.4+signed.1
 Architecture: amd64
 Maintainer: Canonical Kernel Team <kernel-team@lists.ubuntu.com>
 Installed-Size: 8801
diff -urpN orig-e/md5sums new-e/md5sums
--- orig-e/md5sums	2019-06-02 21:57:06.000000000 -0600
+++ new-e/md5sums	2019-06-04 16:09:14.000000000 -0600
@@ -1,3 +1,3 @@ 
 d6af1eaa4513ba9f419e3bcc90abe65f  boot/vmlinuz-5.2.0-3-generic
-1b82cfb11682213fdad4bf690c753513  usr/share/doc/linux-image-5.2.0-3-generic/changelog.Debian.gz
+5c2fb40f52218b28f1c85b928fdb6d15  usr/share/doc/linux-image-5.2.0-3-generic/changelog.Debian.gz
 fddedb6934f1ad0fc12ec614b85c03fa  usr/share/doc/linux-image-5.2.0-3-generic/copyright