diff -Nru linux-restricted-modules-aws-5.13.0/debian/changelog linux-restricted-modules-aws-5.13.0/debian/changelog --- linux-restricted-modules-aws-5.13.0/debian/changelog 2021-11-15 19:50:22.000000000 +0000 +++ linux-restricted-modules-aws-5.13.0/debian/changelog 2021-12-01 17:55:17.000000000 +0000 @@ -1,3 +1,16 @@ +linux-restricted-modules-aws (5.13.0-1008.9) impish; urgency=medium + + * Master version: 5.13.0-1008.9 + + * Packaging resync (LP: #1786013) + - [Packaging] resync update-dkms-versions helper + - debian/dkms-versions -- update from kernel-versions (main/2021.11.29) + + * Miscellaneous Ubuntu changes + - debian/tracking-bug -- update from master + + -- Ian May Wed, 01 Dec 2021 11:55:17 -0600 + linux-restricted-modules-aws (5.13.0-1007.8) impish; urgency=medium * Master version: 5.13.0-1007.8 diff -Nru linux-restricted-modules-aws-5.13.0/debian/control linux-restricted-modules-aws-5.13.0/debian/control --- linux-restricted-modules-aws-5.13.0/debian/control 2021-11-15 19:50:22.000000000 +0000 +++ linux-restricted-modules-aws-5.13.0/debian/control 2021-12-01 17:55:17.000000000 +0000 @@ -9,7 +9,7 @@ curl, dkms, gawk, - linux-headers-5.13.0-1007-aws (>= 5.13.0-1007.8) [amd64], + linux-headers-5.13.0-1008-aws (>= 5.13.0-1008.9) [amd64], lsb-release, python3, python3-apt, @@ -23,7 +23,7 @@ Provides: ${dkms:nvidia-390-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-390-5.13.0-1007-aws (= ${binary:Version}), + linux-modules-nvidia-390-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-390}, Description: Extra drivers for nvidia-390 for the aws flavour Install extra signed nvidia-390 modules compatible with the aws flavour. @@ -35,7 +35,7 @@ Provides: ${dkms:nvidia-470-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-470-5.13.0-1007-aws (= ${binary:Version}), + linux-modules-nvidia-470-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-470}, Description: Extra drivers for nvidia-470 for the aws flavour Install extra signed nvidia-470 modules compatible with the aws flavour. @@ -47,7 +47,7 @@ Provides: ${dkms:nvidia-495-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-495-5.13.0-1007-aws (= ${binary:Version}), + linux-modules-nvidia-495-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-495}, Description: Extra drivers for nvidia-495 for the aws flavour Install extra signed nvidia-495 modules compatible with the aws flavour. @@ -59,7 +59,7 @@ Provides: ${dkms:nvidia-418-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-418-server-5.13.0-1007-aws (= ${binary:Version}), + linux-modules-nvidia-418-server-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-418-server}, Description: Extra drivers for nvidia-418-server for the aws flavour Install extra signed nvidia-418-server modules compatible with the aws flavour. @@ -71,7 +71,7 @@ Provides: ${dkms:nvidia-450-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-450-server-5.13.0-1007-aws (= ${binary:Version}), + linux-modules-nvidia-450-server-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-450-server}, Description: Extra drivers for nvidia-450-server for the aws flavour Install extra signed nvidia-450-server modules compatible with the aws flavour. @@ -83,7 +83,7 @@ Provides: ${dkms:nvidia-460-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-460-server-5.13.0-1007-aws (= ${binary:Version}), + linux-modules-nvidia-460-server-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-460-server}, Description: Extra drivers for nvidia-460-server for the aws flavour Install extra signed nvidia-460-server modules compatible with the aws flavour. @@ -95,7 +95,7 @@ Provides: ${dkms:nvidia-470-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-470-server-5.13.0-1007-aws (= ${binary:Version}), + linux-modules-nvidia-470-server-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-470-server}, Description: Extra drivers for nvidia-470-server for the aws flavour Install extra signed nvidia-470-server modules compatible with the aws flavour. @@ -142,7 +142,7 @@ Description: Extra drivers for nvidia-440-server for the aws flavour (dummy transitional package) Transitional package for upgrades of -440-server to -450-server. -Package: linux-objects-nvidia-390-5.13.0-1007-aws +Package: linux-objects-nvidia-390-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -152,15 +152,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.13.0-1007 (objects) - This package contains the Linux kernel nvidia modules for version 5.13.0-1007. +Description: Linux kernel nvidia modules for version 5.13.0-1008 (objects) + This package contains the Linux kernel nvidia modules for version 5.13.0-1008. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-390-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-390-5.13.0-1007-aws +Package: linux-modules-nvidia-390-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -169,20 +169,20 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.13.0-1007-aws | linux-image-unsigned-5.13.0-1007-aws, - linux-signatures-nvidia-5.13.0-1007-aws (= 5.13.0-1007.8), - linux-objects-nvidia-390-5.13.0-1007-aws (= ${binary:Version}), + linux-image-5.13.0-1008-aws | linux-image-unsigned-5.13.0-1008-aws, + linux-signatures-nvidia-5.13.0-1008-aws (= 5.13.0-1008.9), + linux-objects-nvidia-390-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-390}, -Description: Linux kernel nvidia modules for version 5.13.0-1007 +Description: Linux kernel nvidia modules for version 5.13.0-1008 This package pulls together the Linux kernel nvidia modules for - version 5.13.0-1007 with the appropriate signatures. + version 5.13.0-1008 with the appropriate signatures. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-390-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-objects-nvidia-470-5.13.0-1007-aws +Package: linux-objects-nvidia-470-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -192,15 +192,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.13.0-1007 (objects) - This package contains the Linux kernel nvidia modules for version 5.13.0-1007. +Description: Linux kernel nvidia modules for version 5.13.0-1008 (objects) + This package contains the Linux kernel nvidia modules for version 5.13.0-1008. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-470-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-470-5.13.0-1007-aws +Package: linux-modules-nvidia-470-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -209,20 +209,20 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.13.0-1007-aws | linux-image-unsigned-5.13.0-1007-aws, - linux-signatures-nvidia-5.13.0-1007-aws (= 5.13.0-1007.8), - linux-objects-nvidia-470-5.13.0-1007-aws (= ${binary:Version}), + linux-image-5.13.0-1008-aws | linux-image-unsigned-5.13.0-1008-aws, + linux-signatures-nvidia-5.13.0-1008-aws (= 5.13.0-1008.9), + linux-objects-nvidia-470-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-470}, -Description: Linux kernel nvidia modules for version 5.13.0-1007 +Description: Linux kernel nvidia modules for version 5.13.0-1008 This package pulls together the Linux kernel nvidia modules for - version 5.13.0-1007 with the appropriate signatures. + version 5.13.0-1008 with the appropriate signatures. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-470-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-objects-nvidia-495-5.13.0-1007-aws +Package: linux-objects-nvidia-495-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -232,15 +232,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.13.0-1007 (objects) - This package contains the Linux kernel nvidia modules for version 5.13.0-1007. +Description: Linux kernel nvidia modules for version 5.13.0-1008 (objects) + This package contains the Linux kernel nvidia modules for version 5.13.0-1008. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-495-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-495-5.13.0-1007-aws +Package: linux-modules-nvidia-495-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -249,20 +249,20 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.13.0-1007-aws | linux-image-unsigned-5.13.0-1007-aws, - linux-signatures-nvidia-5.13.0-1007-aws (= 5.13.0-1007.8), - linux-objects-nvidia-495-5.13.0-1007-aws (= ${binary:Version}), + linux-image-5.13.0-1008-aws | linux-image-unsigned-5.13.0-1008-aws, + linux-signatures-nvidia-5.13.0-1008-aws (= 5.13.0-1008.9), + linux-objects-nvidia-495-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-495}, -Description: Linux kernel nvidia modules for version 5.13.0-1007 +Description: Linux kernel nvidia modules for version 5.13.0-1008 This package pulls together the Linux kernel nvidia modules for - version 5.13.0-1007 with the appropriate signatures. + version 5.13.0-1008 with the appropriate signatures. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-495-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-objects-nvidia-418-server-5.13.0-1007-aws +Package: linux-objects-nvidia-418-server-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -272,15 +272,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.13.0-1007 (objects) - This package contains the Linux kernel nvidia modules for version 5.13.0-1007. +Description: Linux kernel nvidia modules for version 5.13.0-1008 (objects) + This package contains the Linux kernel nvidia modules for version 5.13.0-1008. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-418-server-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-418-server-5.13.0-1007-aws +Package: linux-modules-nvidia-418-server-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -289,20 +289,20 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.13.0-1007-aws | linux-image-unsigned-5.13.0-1007-aws, - linux-signatures-nvidia-5.13.0-1007-aws (= 5.13.0-1007.8), - linux-objects-nvidia-418-server-5.13.0-1007-aws (= ${binary:Version}), + linux-image-5.13.0-1008-aws | linux-image-unsigned-5.13.0-1008-aws, + linux-signatures-nvidia-5.13.0-1008-aws (= 5.13.0-1008.9), + linux-objects-nvidia-418-server-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-418-server}, -Description: Linux kernel nvidia modules for version 5.13.0-1007 +Description: Linux kernel nvidia modules for version 5.13.0-1008 This package pulls together the Linux kernel nvidia modules for - version 5.13.0-1007 with the appropriate signatures. + version 5.13.0-1008 with the appropriate signatures. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-418-server-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-objects-nvidia-450-server-5.13.0-1007-aws +Package: linux-objects-nvidia-450-server-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -312,15 +312,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.13.0-1007 (objects) - This package contains the Linux kernel nvidia modules for version 5.13.0-1007. +Description: Linux kernel nvidia modules for version 5.13.0-1008 (objects) + This package contains the Linux kernel nvidia modules for version 5.13.0-1008. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-450-server-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-450-server-5.13.0-1007-aws +Package: linux-modules-nvidia-450-server-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -329,20 +329,20 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.13.0-1007-aws | linux-image-unsigned-5.13.0-1007-aws, - linux-signatures-nvidia-5.13.0-1007-aws (= 5.13.0-1007.8), - linux-objects-nvidia-450-server-5.13.0-1007-aws (= ${binary:Version}), + linux-image-5.13.0-1008-aws | linux-image-unsigned-5.13.0-1008-aws, + linux-signatures-nvidia-5.13.0-1008-aws (= 5.13.0-1008.9), + linux-objects-nvidia-450-server-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-450-server}, -Description: Linux kernel nvidia modules for version 5.13.0-1007 +Description: Linux kernel nvidia modules for version 5.13.0-1008 This package pulls together the Linux kernel nvidia modules for - version 5.13.0-1007 with the appropriate signatures. + version 5.13.0-1008 with the appropriate signatures. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-450-server-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-objects-nvidia-460-server-5.13.0-1007-aws +Package: linux-objects-nvidia-460-server-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -352,15 +352,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.13.0-1007 (objects) - This package contains the Linux kernel nvidia modules for version 5.13.0-1007. +Description: Linux kernel nvidia modules for version 5.13.0-1008 (objects) + This package contains the Linux kernel nvidia modules for version 5.13.0-1008. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-460-server-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-460-server-5.13.0-1007-aws +Package: linux-modules-nvidia-460-server-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -369,20 +369,20 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.13.0-1007-aws | linux-image-unsigned-5.13.0-1007-aws, - linux-signatures-nvidia-5.13.0-1007-aws (= 5.13.0-1007.8), - linux-objects-nvidia-460-server-5.13.0-1007-aws (= ${binary:Version}), + linux-image-5.13.0-1008-aws | linux-image-unsigned-5.13.0-1008-aws, + linux-signatures-nvidia-5.13.0-1008-aws (= 5.13.0-1008.9), + linux-objects-nvidia-460-server-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-460-server}, -Description: Linux kernel nvidia modules for version 5.13.0-1007 +Description: Linux kernel nvidia modules for version 5.13.0-1008 This package pulls together the Linux kernel nvidia modules for - version 5.13.0-1007 with the appropriate signatures. + version 5.13.0-1008 with the appropriate signatures. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-460-server-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-objects-nvidia-470-server-5.13.0-1007-aws +Package: linux-objects-nvidia-470-server-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -392,15 +392,15 @@ ${misc:Depends}, ${shlibs:Depends}, binutils, -Description: Linux kernel nvidia modules for version 5.13.0-1007 (objects) - This package contains the Linux kernel nvidia modules for version 5.13.0-1007. +Description: Linux kernel nvidia modules for version 5.13.0-1008 (objects) + This package contains the Linux kernel nvidia modules for version 5.13.0-1008. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-470-server-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-470-server-5.13.0-1007-aws +Package: linux-modules-nvidia-470-server-5.13.0-1008-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -409,13 +409,13 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, - linux-image-5.13.0-1007-aws | linux-image-unsigned-5.13.0-1007-aws, - linux-signatures-nvidia-5.13.0-1007-aws (= 5.13.0-1007.8), - linux-objects-nvidia-470-server-5.13.0-1007-aws (= ${binary:Version}), + linux-image-5.13.0-1008-aws | linux-image-unsigned-5.13.0-1008-aws, + linux-signatures-nvidia-5.13.0-1008-aws (= 5.13.0-1008.9), + linux-objects-nvidia-470-server-5.13.0-1008-aws (= ${binary:Version}), ${nvk:nvidia-470-server}, -Description: Linux kernel nvidia modules for version 5.13.0-1007 +Description: Linux kernel nvidia modules for version 5.13.0-1008 This package pulls together the Linux kernel nvidia modules for - version 5.13.0-1007 with the appropriate signatures. + version 5.13.0-1008 with the appropriate signatures. . You likely do not want to install this package directly. Instead, install the one of the linux-modules-nvidia-470-server-aws* meta-packages, diff -Nru linux-restricted-modules-aws-5.13.0/debian/dkms-versions linux-restricted-modules-aws-5.13.0/debian/dkms-versions --- linux-restricted-modules-aws-5.13.0/debian/dkms-versions 2021-11-15 19:50:21.000000000 +0000 +++ linux-restricted-modules-aws-5.13.0/debian/dkms-versions 2021-12-01 17:55:16.000000000 +0000 @@ -1,8 +1,7 @@ -zfs-linux 2.0.6-1ubuntu2 nvidia-graphics-drivers-390 390.144-0ubuntu2 nvidia-graphics-drivers-470 470.86-0ubuntu0.21.10.1 transition=nvidia-graphics-drivers-465 transition=nvidia-graphics-drivers-460 transition=nvidia-graphics-drivers-455 transition=nvidia-graphics-drivers-450 transition=nvidia-graphics-drivers-435 nvidia-graphics-drivers-495 495.44-0ubuntu0.21.10.1 -nvidia-graphics-drivers-418-server 418.226.00-0ubuntu0.21.10.1 -nvidia-graphics-drivers-450-server 450.156.00-0ubuntu0.21.10.1 transition=nvidia-graphics-drivers-440-server -nvidia-graphics-drivers-460-server 460.106.00-0ubuntu0.21.10.1 -nvidia-graphics-drivers-470-server 470.82.01-0ubuntu0.21.10.1 +nvidia-graphics-drivers-418-server 418.226.00-0ubuntu0.21.10.2 +nvidia-graphics-drivers-450-server 450.156.00-0ubuntu0.21.10.2 transition=nvidia-graphics-drivers-440-server +nvidia-graphics-drivers-460-server 460.106.00-0ubuntu0.21.10.2 +nvidia-graphics-drivers-470-server 470.82.01-0ubuntu0.21.10.2 diff -Nru linux-restricted-modules-aws-5.13.0/debian/tracking-bug linux-restricted-modules-aws-5.13.0/debian/tracking-bug --- linux-restricted-modules-aws-5.13.0/debian/tracking-bug 2021-11-15 18:30:32.000000000 +0000 +++ linux-restricted-modules-aws-5.13.0/debian/tracking-bug 2021-12-01 17:10:02.000000000 +0000 @@ -1 +1 @@ -1949733 2021.11.08-1 +1952256 2021.11.29-1 diff -Nru linux-restricted-modules-aws-5.13.0/update-dkms-versions linux-restricted-modules-aws-5.13.0/update-dkms-versions --- linux-restricted-modules-aws-5.13.0/update-dkms-versions 2021-10-25 17:56:11.000000000 +0000 +++ linux-restricted-modules-aws-5.13.0/update-dkms-versions 2021-11-29 15:22:00.000000000 +0000 @@ -115,10 +115,16 @@ # Determine our series and mainline version from our own changelog. our_series=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SDistribution) -if [ "$series" = "UNRELEASED" ]; then - our_series=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -c1 -SDistribution) +if [ "$our_series" = "UNRELEASED" ]; then + our_series=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -o1 -c1 -SDistribution) fi our_mainline=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SVersion | sed -e 's/-.*//') +our_package=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SSource) +our_source=$(echo "$our_package" | sed -e 's/-restricted-modules//') +case "$our_package" in +linux-restricted-modules*) our_type="lrm" ;; +*) our_type="main" ;; +esac # Update rules are complex. We update development series kernels to the # versions in development. For stable series we update versions against @@ -126,29 +132,42 @@ # via the map/dkms-versions namespace. Attempt to map via our series # and then our mainline-version. -# Attempt to map via our series, if that works assume we are development. -versions_path=$(cat_file -p "$git_base:map/dkms-versions/$our_series" 2>/dev/null) +# Try and find a package specific dkms-versions fragment. Try: +# handle+type +# series+type +# mainline+type +# series - backwards compatibility +# mainline - backwards compatibility +for versions_path_tail in \ + "$our_series:$our_source:$our_type" \ + "$our_series:$our_type" \ + "$our_mainline:$our_type" \ + "$our_series" \ + "$our_mainline" +do + echo "II: trying $versions_path_tail ..." + versions_paths=$(echo $(cat_file -p "$git_base:map/dkms-versions/$versions_path_tail" 2>/dev/null)) + [ -n "$versions_paths" ] && break +done -# If we do not yet have a mapping re-map using our mainline version. -if [ -z "$versions_path" ]; then - versions_path=$(cat_file -p "$git_base:map/dkms-versions/$our_mainline") -fi - -echo "git_base<$git_base> versions_path<$versions_path>" -echo "II: grabbing dkms-versions from $sru_cycle $versions_path" - -cat_file -p "$git_base:$versions_path" >"debian/dkms-versions.new" -rc="$?" -if [ "$rc" -ne 0 ]; then - echo "$0: unable to download an updated dkms-versions file" 1>&2 +if [ -z "$versions_paths" ]; then + echo "$0: unable to identify dkms-versions mapping" 1>&2 exit 1 +fi -elif [ "$rc" -eq 0 ]; then - mv "debian/dkms-versions.new" "debian/dkms-versions" +echo "git_base<$git_base> versions_paths<$versions_paths>" +echo "II: grabbing dkms-versions from $sru_cycle $versions_paths" -else - rm -f "debian/dkms-versions.new" -fi +: ">debian/dkms-versions.new" +for versions_path in $versions_paths +do + cat_file -p "$git_base:$versions_path" >>"debian/dkms-versions.new" + if [ "$?" -ne 0 ]; then + echo "$0: unable to download an updated dkms-versions file" 1>&2 + exit 1 + fi +done +mv "debian/dkms-versions.new" "debian/dkms-versions" thing="debian/dkms-versions" if ! git diff --exit-code -- "$thing" >/dev/null; then @@ -159,4 +178,4 @@ echo "$thing: no changes from kernel-versions" fi -exit "$rc" +exit 0