From c152ea41bc55d8c5f22019da7911976ac40280a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= Date: Mon, 15 Jan 2024 17:46:35 +0100 Subject: [PATCH] CI: adopt for usrmerge paths --- .github/workflows/autopkgtest.yml | 7 ++++++- .github/workflows/network-manager.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/autopkgtest.yml b/.github/workflows/autopkgtest.yml index e0f259582..60cca520a 100644 --- 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 index 8fc2601f2..ce5e39af8 100644 --- 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