diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-04 20:18:12 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-04 20:20:44 +0000 |
| commit | 26112aba1f02395b4241eebf66879e5879ad8a13 (patch) | |
| tree | 032da7dabb644124cc416ffbc4e596b724cd3a2c | |
| parent | Releasing debian version 20190301-lts1-3. (diff) | |
| download | open-infrastructure-system-tools-26112aba1f02395b4241eebf66879e5879ad8a13.tar.xz open-infrastructure-system-tools-26112aba1f02395b4241eebf66879e5879ad8a13.zip | |
Moving system-images into system-build to avoid future NEW processing when adding further images (using different backends).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/control | 14 | ||||
| -rwxr-xr-x | debian/rules | 11 |
2 files changed, 8 insertions, 17 deletions
diff --git a/debian/control b/debian/control index 892ad5c..27c5dd6 100644 --- a/debian/control +++ b/debian/control @@ -61,8 +61,10 @@ Suggests: gpgv, Conflicts: live-build, + open-infrastructure-system-images, Replaces: live-build, + open-infrastructure-system-images, Provides: system-build, Description: Build Debian-based system images @@ -100,15 +102,3 @@ Provides: Description: Configure Debian-based system images system-config provides the system integration for configuring a read-only root filesystem such as a live system. - -Package: open-infrastructure-system-images -Section: admin -Architecture: all -Depends: - open-infrastructure-system-build (>= 20161115), - ${misc:Depends}, -Provides: - system-images, -Description: Debian-based system images - system-images contains the configuration directories for system-build to - build live system images. diff --git a/debian/rules b/debian/rules index 40bb80f..f54b4e3 100755 --- a/debian/rules +++ b/debian/rules @@ -33,9 +33,10 @@ override_dh_auto_install: rm -rf debian/*/usr/share/doc/live-build - rm -f debian/open-infrastructure-system-images/usr/share/doc/system-images/CHANGELOG.txt - rm -f debian/open-infrastructure-system-images/usr/share/doc/system-images/LICENSE.txt - mv debian/open-infrastructure-system-images/usr/share/doc/system-images debian/open-infrastructure-system-images/usr/share/doc/open-infrastructure-system-images + # moving system-images into system-build + mv debian/open-infrastructure-system-images/usr/share/system-images debian/open-infrastructure-system-build/usr/share + mkdir -p debian/open-infrastructure-system-build/usr/share/man/man7 + mv debian/open-infrastructure-system-images/usr/share/man/man7/* debian/open-infrastructure-system-build/usr/share/man/man7 override_dh_compress: dh_compress -Xusr/share/doc/open-infrastructure-system-config/examples -Xusr/share/system-images @@ -67,6 +68,6 @@ override_dh_link: for DIRECTORY in debian/*/usr/share/system-images/*; \ do \ IMAGE="$$(basename $${DIRECTORY})"; \ - rm -rf debian/open-infrastructure-system-images/usr/share/system-images/$${IMAGE}/config/bootloaders; \ - cp -a system-images/share/images/$${IMAGE}/config/bootloaders debian/open-infrastructure-system-images/usr/share/system-images/$${IMAGE}/config/bootloaders; \ + rm -rf debian/open-infrastructure-system-build/usr/share/system-images/$${IMAGE}/config/bootloaders; \ + cp -a system-images/share/images/$${IMAGE}/config/bootloaders debian/open-infrastructure-system-build/usr/share/system-images/$${IMAGE}/config/bootloaders; \ done |