CI: adopt for usrmerge paths

canonical · Jan 16, 2024 · c152ea4 · c152ea4
1 parent f3be837
commit c152ea4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/autopkgtest.yml b/.github/workflows/autopkgtest.yml
@@ -45,7 +45,12 @@ jobs:
           pull-lp-source netplan.io
           cp -r netplan.io-*/debian .
           rm -r debian/patches/  # clear any distro patches
-          sed -i 's|rm debian/tmp/lib/netplan/generate|# DELETED|' debian/rules
+          # usrmerge-fix
+          mkdir debian/extra
+          touch debian/extra/PLACEHOLDER
+          echo "../extra/PLACEHOLDER usr/lib/netplan/PLACEHOLDER" >> debian/extra/PLACEHOLDER
+          sed -i 's|rm debian/tmp/lib/netplan/generate|sh -c "mkdir -p debian/tmp/usr/lib/systemd/system-generators; rm -rf debian/tmp/lib; ln -sf /usr/libexec/netplan/generate debian/tmp/usr/lib/systemd/system-generators/netplan"|' debian/rules
+          # usrmerge-fix-end
           TAG=$(git describe --tags $(git rev-list --tags --max-count=1))  # find latest (stable) tag
           REV=$(git rev-parse --short HEAD)  # get current git revision
           VER="$TAG+git~$REV"

diff --git a/.github/workflows/network-manager.yml b/.github/workflows/network-manager.yml
@@ -40,7 +40,12 @@ jobs:
           pull-lp-source netplan.io
           cp -r netplan.io-*/debian .
           rm -r debian/patches/  # clear any distro patches
-          sed -i 's|rm debian/tmp/lib/netplan/generate|# DELETED|' debian/rules
+          # usrmerge-fix
+          mkdir debian/extra
+          touch debian/extra/PLACEHOLDER
+          echo "../extra/PLACEHOLDER usr/lib/netplan/PLACEHOLDER" >> debian/extra/PLACEHOLDER
+          sed -i 's|rm debian/tmp/lib/netplan/generate|sh -c "mkdir -p debian/tmp/usr/lib/systemd/system-generators; rm -rf debian/tmp/lib; ln -sf /usr/libexec/netplan/generate debian/tmp/usr/lib/systemd/system-generators/netplan"|' debian/rules
+          # usrmerge-fix-end
           echo "3.0 (native)" > debian/source/format  # force native build
           TAG=$(git describe --tags $(git rev-list --tags --max-count=1))  # find latest (stable) tag
           REV=$(git rev-parse --short HEAD)  # get current git revision