Code review comment for ~fourdollars/pc-enablement/+git/oem-scripts:master

Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

$ ./oem-meta-packages --dry-run update --meta oem-somerville-three-eyed-raven-meta
<INFO> Using oem-scripts login
<INFO> Loading KWallet
<INFO> Loading SecretService
<INFO> Loading Windows
<INFO> Loading chainer
<INFO> Loading macOS
<INFO> Checking oem-somerville-three-eyed-raven-meta...
<INFO> OemFromGit (20.04ubuntu4, default, linux-generic-hwe-20.04, , )
<INFO> OemFromPPA (20.04ubuntu4, default, linux-generic-hwe-20.04, ppa:oem-archive/somerville-three-eyed-raven, )
<INFO> OemFromDevelArchive (20.04ubuntu4, default, linux-generic-hwe-20.04, cesg:somerville-three-eyed-raven-focal-devel, )
<INFO> OemFromStagingArchive (20.04ubuntu4, default, linux-generic-hwe-20.04, cesg:somerville-three-eyed-raven-focal-staging, )
<INFO> OemFromPublicArchive (20.04ubuntu4, default, linux-generic-hwe-20.04, oem:somerville-three-eyed-raven, )
<INFO> BootstrapFromGit (20.04~ubuntu2, default, , , )
<INFO> BootstrapFromPPA (, , , ppa:canonical-oem-metapackage-uploaders/oem-metapackage-staging, )
<INFO> BootstrapFromProposedArchive (, , , ubuntu:focal-proposed, )
<INFO> BootstrapFromUbuntuArchive (20.04~ubuntu2, default, , ubuntu:focal|focal-updates, )
<INFO> Checking oem-somerville-three-eyed-raven-meta bootstrap=BootstrapGroup(git=PkgData(version='20.04~ubuntu2', archive='', kernel_flavour='default', kernel_meta='', fingerprint='', market_name=''), ppa=PkgData(version='', archive='ppa:canonical-oem-metapackage-uploaders/oem-metapackage-staging', kernel_flavour='', kernel_meta='', fingerprint='EA7BFBE3B33B9D51D225430EC83677AEDFC29884', market_name=''), proposed=PkgData(version='', archive='ubuntu:focal-proposed', kernel_flavour='', kernel_meta='', fingerprint='', market_name=''), ubuntu=PkgData(version='20.04~ubuntu2', archive='ubuntu:focal|focal-updates', kernel_flavour='default', kernel_meta='', fingerprint='', market_name='')) oem=OemGroup(git=PkgData(version='20.04ubuntu4', archive='', kernel_flavour='default', kernel_meta='linux-generic-hwe-20.04', fingerprint='', market_name=''), ppa=PkgData(version='20.04ubuntu4', archive='ppa:oem-archive/somerville-three-eyed-raven', kernel_flavour='default', kernel_meta='linux-generic-hwe-20.04', fingerprint='B02DB471D6E2ADFF98B0CBA5D4EFDDE038AD84EA', market_name=''), devel=PkgData(version='20.04ubuntu4', archive='cesg:somerville-three-eyed-raven-focal-devel', kernel_flavour='default', kernel_meta='linux-generic-hwe-20.04', fingerprint='A9DD3581844D8C9463652FA354F1860295829CE3', market_name=''), staging=PkgData(version='20.04ubuntu4', archive='cesg:somerville-three-eyed-raven-focal-staging', kernel_flavour='default', kernel_meta='linux-generic-hwe-20.04', fingerprint='A9DD3581844D8C9463652FA354F1860295829CE3', market_name=''), public=PkgData(version='20.04ubuntu4', archive='oem:somerville-three-eyed-raven', kernel_flavour='default', kernel_meta='linux-generic-hwe-20.04', fingerprint='59AC787C2A8C78BA5ECA0B2ED4D1EAED36962F69', market_name='')) old_desc='' new_desc=''...
<INFO> gbp:info: Tagging Debian package 20.04ubuntu5 as three-eyed-raven-focal-oem_20.04ubuntu5 in git
<INFO> three-eyed-raven-focal-oem_20.04ubuntu5
<WARNING> (oem-somerville-three-eyed-raven-meta:three-eyed-raven-focal-oem) $ git show
commit cd61b78ea90112408a1bf2e746efabf1a0a44740
Author: Shih-Yuan Lee (FourDollars) <email address hidden>
Date: Mon Nov 8 22:32:26 2021 +0800

    Update the grub flavour, maintainer scripts, debian/modaliases, debian/gbp.conf and debian/tests for linux-generic-hwe-20.04.

    Updated by oem-scripts 1.18.

diff --git a/debian/changelog b/debian/changelog
index 8111faa..8c9b17f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+oem-somerville-three-eyed-raven-meta (20.04ubuntu5) focal; urgency=medium
+
+ * Update the grub flavour, maintainer scripts, debian/modaliases,
+ debian/gbp.conf and debian/tests for linux-generic-hwe-20.04.
+
+ -- Shih-Yuan Lee (FourDollars) <email address hidden> Mon, 08 Nov 2021 22:32:26 +0800
+
 oem-somerville-three-eyed-raven-meta (20.04ubuntu4) focal; urgency=medium

   * debian/control: Depend on oem-somerville-meta and remove
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..1ccc707
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+pristine-tar = False
+debian-branch = three-eyed-raven-focal-oem
+debian-tag = three-eyed-raven-focal-oem_%(version)s
diff --git a/debian/install b/debian/install
index 2cefc48..ff593f9 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1,2 @@
 oem-somerville-three-eyed-raven-meta.list /etc/apt/sources.list.d/
+oem-flavour.cfg /usr/share/oem-somerville-three-eyed-raven-meta/
diff --git a/debian/modaliases b/debian/modaliases
index c72b1b5..8d06174 100644
--- a/debian/modaliases
+++ b/debian/modaliases
@@ -1 +1 @@
-alias pci:*sv00001028sd00000962* meta oem-somerville-three-eyed-raven-meta
+alias pci:*sv00001028sd00000962bc0Csc05* meta oem-somerville-three-eyed-raven-meta
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..d032b93
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+case "$1" in
+ configure)
+ mkdir -p /etc/default/grub.d/
+ ln -sf /usr/share/oem-somerville-three-eyed-raven-meta/oem-flavour.cfg /etc/default/grub.d/oem-flavour.cfg
+ if [ -e /boot/grub/grub.cfg ] && command -v update-grub; then
+ update-grub
+ fi
+ ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..e2cfd3d
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+case "$1" in
+ remove|purge)
+ rm -f /etc/default/grub.d/oem-flavour.cfg
+ if [ -e /boot/grub/grub.cfg ] && command -v update-grub; then
+ update-grub
+ fi
+ ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..75befe6
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: meta
+Depends: @
+Restrictions: needs-root
diff --git a/debian/tests/meta b/debian/tests/meta
new file mode 100644
index 0000000..07b01d0
--- /dev/null
+++ b/debian/tests/meta
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+exec 2>&1
+set -euo pipefail
+IFS=$'\n\t'
+
+apt-get update
+apt-get full-upgrade --yes
+
+apt-get update
+apt-get full-upgrade --yes
+
+grep ^GRUB_FLAVOUR_ORDER=generic$ /etc/default/grub.d/oem-flavour.cfg
+
+dpkg-query -W -f='${Status}' linux-generic-hwe-20.04 | grep "install ok installed"
+
+apt-get autoremove --purge --yes oem-somerville-three-eyed-raven-meta
diff --git a/oem-flavour.cfg b/oem-flavour.cfg
new file mode 100644
index 0000000..976414f
--- /dev/null
+++ b/oem-flavour.cfg
@@ -0,0 +1,2 @@
+# This file is automatically generated by oem-somerville-three-eyed-raven-meta, and changes will be overriden
+GRUB_FLAVOUR_ORDER=generic

« Back to merge proposal