diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-03-08 12:57:31 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-03-13 12:07:09 +0100 |
| commit | 4cc17467a1254a09b15657aa0288fae168bd3f7e (patch) | |
| tree | 6cfa0ee011d65869994ac99d8d6898ae58559326 /mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot | |
| parent | update TODO (diff) | |
| download | systemd-4cc17467a1254a09b15657aa0288fae168bd3f7e.tar.xz systemd-4cc17467a1254a09b15657aa0288fae168bd3f7e.zip | |
mkosi: Use same pkg/ subdirectory for debian and ubuntu
Instead of cloning the same repository twice, let's make sure we
use the same directory for both debian/ubuntu.
Diffstat (limited to 'mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot')
| -rwxr-xr-x | mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot b/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot index d1ec8c1894..7fb650f501 100755 --- a/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot +++ b/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot @@ -2,13 +2,13 @@ # SPDX-License-Identifier: LGPL-2.1-or-later set -e -if [ ! -d "pkg/$DISTRIBUTION/debian" ]; then - echo "deb rules not found at pkg/$DISTRIBUTION/debian, run mkosi once with -ff to make sure the rules are cloned" >&2 +if [ ! -d "pkg/$PKG_SUBDIR/debian" ]; then + echo "deb rules not found at pkg/$PKG_SUBDIR/debian, run mkosi once with -ff to make sure the rules are cloned" >&2 exit 1 fi # We transplant the debian/ folder from the deb package sources into the upstream sources. -mount --mkdir --bind "$SRCDIR/pkg/$DISTRIBUTION/debian" "$SRCDIR"/debian +mount --mkdir --bind "$SRCDIR/pkg/$PKG_SUBDIR/debian" "$SRCDIR"/debian # We hide the patches/ directory by mounting an empty directory on top so they don't get applied. TMP=$(mktemp -d) |