diff -pruN 4.5/debian/changelog 4.5ubuntu4/debian/changelog --- 4.5/debian/changelog 2016-09-16 23:59:15.000000000 +0000 +++ 4.5ubuntu4/debian/changelog 2020-06-25 17:23:24.000000000 +0000 @@ -1,3 +1,29 @@ +linux-base (4.5ubuntu4) groovy; urgency=medium + + * Update SGX udev rules for version LD_1.33 (LP: #1881338). + + -- Marcelo Henrique Cerri Thu, 25 Jun 2020 14:23:24 -0300 + +linux-base (4.5ubuntu3) focal; urgency=medium + + * Add linux-base-sgx package with SGX udev rules (LP: #1867820). + + -- Timo Aaltonen Wed, 18 Mar 2020 13:05:24 +0200 + +linux-base (4.5ubuntu2) devel; urgency=medium + + * Default to link_in_boot by default, on all architectures. + + -- Dimitri John Ledkov Wed, 17 Apr 2019 17:20:45 +0100 + +linux-base (4.5ubuntu1) artful; urgency=low + + * Merge from Debian unstable. Remaining changes: + - do not install /usr/bin/perf, perf.8, bash-completion/perf + which are provided by linux-tools-common (LP: #1008713) + + -- Andy Whitcroft Fri, 28 Apr 2017 05:16:31 +0100 + linux-base (4.5) unstable; urgency=medium [ Salvatore Bonaccorso ] @@ -63,6 +89,14 @@ linux-base (4.1) unstable; urgency=mediu -- Ben Hutchings Sun, 05 Jun 2016 02:13:38 +0100 +linux-base (4.0ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - do not install /usr/bin/perf or perf.8 which are provided by + linux-tools-common (LP: #1008713) + + -- Andy Whitcroft Wed, 13 Jan 2016 17:18:53 +0000 + linux-base (4.0) unstable; urgency=low * Remove obsolete postinst upgrade code and translations @@ -80,6 +114,43 @@ linux-base (4.0) unstable; urgency=low -- Ben Hutchings Tue, 04 Aug 2015 21:24:05 +0100 +linux-base (3.5ubuntu4) quantal-proposed; urgency=low + + * Remove perf man page since its provided by (and conflicts with) + linux-tools-common. + -LP: #1008713 + + -- Tim Gardner Tue, 25 Sep 2012 14:24:56 -0600 + +linux-base (3.5ubuntu3) quantal; urgency=low + + * remove the postinst script, in ubuntu we did the UUID transition + years ago and it does not seem to take u-boot into account as a + bootloader. this results in a debconf error message on all arm + systems. + + -- Thu, 31 May 2012 17:39:54 +0200 + +linux-base (3.5ubuntu2) quantal; urgency=low + + * Added 'Build-Depends: quilt' + + -- Tim Gardner Wed, 23 May 2012 13:54:16 -0600 + +linux-base (3.5ubuntu1) quantal; urgency=low + + * Added quilt patch support + * Remove /usr/bin/perf from this package as it conflicts with + the Ubuntu kernel tools package linux-tools-common (which + provides the real /usr/bin/perf). I can think of no reason why + this should cause a problem. /usr/bin/perf is kernel ABI version + specific, therefore it can only be provided by the correct + version of linux-tools-$version-$abi. + debian/patches/0001-remove-bin-perf.patch + -LP: #931353 + + -- Tim Gardner Wed, 23 May 2012 13:35:38 -0600 + linux-base (3.5) unstable; urgency=low * debian/control: Set Multi-Arch: foreign to allow for installation diff -pruN 4.5/debian/control 4.5ubuntu4/debian/control --- 4.5/debian/control 2016-09-16 23:57:41.000000000 +0000 +++ 4.5ubuntu4/debian/control 2020-06-25 17:23:24.000000000 +0000 @@ -1,7 +1,8 @@ Source: linux-base Section: kernel Priority: optional -Maintainer: Debian Kernel Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Kernel Team Uploaders: Bastian Blank , Frederik Schüler , maximilian attems , Ben Hutchings Standards-Version: 3.9.8 Build-Depends: debhelper (>> 9), bash-completion @@ -15,3 +16,11 @@ Multi-Arch: foreign Description: Linux image base package This package contains files and support scripts for all Linux images. + +Package: linux-base-sgx +Architecture: all +Depends: ${misc:Depends} +Multi-Arch: foreign +Description: Linux image base package for DCAP SGX + This package contains files and support scripts for all Linux + images with DCAP SGX drivers. diff -pruN 4.5/debian/linux-base.bash-completion 4.5ubuntu4/debian/linux-base.bash-completion --- 4.5/debian/linux-base.bash-completion 2016-09-16 23:57:23.000000000 +0000 +++ 4.5ubuntu4/debian/linux-base.bash-completion 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -bash-completion/perf diff -pruN 4.5/debian/linux-base.install 4.5ubuntu4/debian/linux-base.install --- 4.5/debian/linux-base.install 2016-06-06 03:17:36.000000000 +0000 +++ 4.5ubuntu4/debian/linux-base.install 2020-06-25 17:23:24.000000000 +0000 @@ -1,5 +1,4 @@ bin/linux-check-removal usr/bin bin/linux-update-symlinks usr/bin bin/linux-version usr/bin -bin/perf usr/bin lib/DebianLinux.pm usr/share/perl5 diff -pruN 4.5/debian/linux-base.manpages 4.5ubuntu4/debian/linux-base.manpages --- 4.5/debian/linux-base.manpages 2016-06-06 02:59:14.000000000 +0000 +++ 4.5ubuntu4/debian/linux-base.manpages 2020-06-25 17:23:24.000000000 +0000 @@ -1,4 +1,3 @@ man/linux-check-removal.1 man/linux-update-symlinks.1 man/linux-version.1 -man/perf.1 diff -pruN 4.5/debian/linux-base-sgx.postinst 4.5ubuntu4/debian/linux-base-sgx.postinst --- 4.5/debian/linux-base-sgx.postinst 1970-01-01 00:00:00.000000000 +0000 +++ 4.5ubuntu4/debian/linux-base-sgx.postinst 2020-06-25 17:23:24.000000000 +0000 @@ -0,0 +1,19 @@ +#!/bin/sh +# postinst script for linux-base-sgx + +set -e + +case "$1" in + configure) + # Add the sgx_prv group unless it's already there + addgroup --quiet --system sgx_prv || true + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# diff -pruN 4.5/debian/linux-base-sgx.udev 4.5ubuntu4/debian/linux-base-sgx.udev --- 4.5/debian/linux-base-sgx.udev 1970-01-01 00:00:00.000000000 +0000 +++ 4.5ubuntu4/debian/linux-base-sgx.udev 2020-06-25 17:23:24.000000000 +0000 @@ -0,0 +1,6 @@ +# SGX DCAP LD_1.22: +SUBSYSTEM=="sgx",KERNEL=="sgx",MODE="0666" +SUBSYSTEM=="sgx",KERNEL=="sgx_prv",GROUP="sgx_prv",MODE="0660" +# SGX DCAP LD_1.33: +SUBSYSTEM=="misc",KERNEL=="enclave",MODE="0666" +SUBSYSTEM=="misc",KERNEL=="provision",GROUP="sgx_prv",MODE="0660" diff -pruN 4.5/lib/DebianLinux.pm 4.5ubuntu4/lib/DebianLinux.pm --- 4.5/lib/DebianLinux.pm 2016-06-05 22:03:34.000000000 +0000 +++ 4.5ubuntu4/lib/DebianLinux.pm 2020-06-25 17:23:24.000000000 +0000 @@ -112,7 +112,7 @@ sub read_kernelimg_conf { my $conf = { do_symlinks => 1, image_dest => '/', - link_in_boot => 0, + link_in_boot => 1, no_symlinks => 0, }; diff -pruN 4.5/lib/t/DebianLinux.t 4.5ubuntu4/lib/t/DebianLinux.t --- 4.5/lib/t/DebianLinux.t 2016-06-05 01:13:24.000000000 +0000 +++ 4.5ubuntu4/lib/t/DebianLinux.t 2020-06-25 17:23:24.000000000 +0000 @@ -88,7 +88,7 @@ sub hash_equal { ok(hash_equal(read_kernelimg_conf_str(''), { do_symlinks => 1, - image_dest => '/', + image_dest => '/boot', })); # Sample config ok(hash_equal(read_kernelimg_conf_str(<< 'EOT'), @@ -151,24 +151,24 @@ do_symlinks = false EOT { do_symlinks => 0, - image_dest => '/', + image_dest => '/boot', })); ok(hash_equal(read_kernelimg_conf_str(<< 'EOT'), do_symlinks = no EOT { do_symlinks => 0, - image_dest => '/', + image_dest => '/boot', })); # Check that invalid values have no effect ok(hash_equal(read_kernelimg_conf_str(<< 'EOT'), do_symlinks= -link_in_boot yes -link_in_boot 1 +link_in_boot no +link_in_boot 0 EOT { do_symlinks => 1, - image_dest => '/', + image_dest => '/boot', })); # Check link_in_boot dominates image_dest ok(hash_equal(read_kernelimg_conf_str(<< 'EOT'),