[neon/neon/livecd-rootfs/Neon/release] /: The ubuntustudio dkms hook is only created when we're building ubuntustudio, so only chmod it when it exists. LP: #1983521.

Steve Langasek null at kde.org
Tue Aug 9 15:48:29 BST 2022


Git commit 9da86ba533ed24125f68b0ada1e968ffe5f7a563 by Steve Langasek.
Committed on 04/08/2022 at 19:11.
Pushed by jriddell into branch 'Neon/release'.

The ubuntustudio dkms hook is only created when we're building ubuntustudio, so only chmod it when it exists.  LP: #1983521.

M  +7    -0    debian/changelog
M  +1    -1    live-build/auto/config

https://invent.kde.org/neon/neon/livecd-rootfs/commit/9da86ba533ed24125f68b0ada1e968ffe5f7a563

diff --git a/debian/changelog b/debian/changelog
index 16cbdb81..2972a7a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.765.10) UNRELEASED; urgency=medium
+
+  * The ubuntustudio dkms hook is only created when we're building
+    ubuntustudio, so only chmod it when it exists.  LP: #1983521.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Thu, 04 Aug 2022 12:10:37 -0700
+
 livecd-rootfs (2.765.9) jammy; urgency=medium
 
   * When adding the new RISC-V platforms, some of the generic non-SUBARCH code
diff --git a/live-build/auto/config b/live-build/auto/config
index 8e594f9c..1fb84478 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1306,8 +1306,8 @@ env DEBIAN_FRONTEND=noninteractive \
        apt-get -y autoremove --purge v4l2loopback-dkms v4l2loopback-utils
 
 EOF
+	chmod +x config/hooks/100-ubuntustudio-dkms.chroot
 fi
-chmod +x config/hooks/100-ubuntustudio-dkms.chroot
 
 if $BINARY_REMOVE_LINUX; then
 	cat > config/binary_rootfs/excludes << EOF



More information about the Neon-commits mailing list