From 4705bb80d9c54026b7808d2dd2f7f3811919516a Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 31 May 2017 13:18:10 -0300 Subject: [PATCH] Restore ostree-boot files to main ostree package Debian doesn't install the ostree-boot package since they don't have a way to confirm it works, but we install those pieces as part of the main ostree package. The only exception is the full GRUB integration (etc/grub.d/15_ostree), where we only use the Boot Loader Spec (BLS) configuration from GRUB to show new ostree entries. https://phabricator.endlessm.com/T17204 Rebase 2018.6 (T23138): Move the new systemd service lib/systemd/system/ostree-finalize-staged.service from ostree-boot to ostree Rebase 2019.1 (T25195): Move ostree-finalize-staged.path from ostree-boot to ostree --- debian/ostree.install | 10 ++++++++++ debian/ostree.maintscript | 2 -- debian/rules | 13 ------------- 3 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 debian/ostree.maintscript diff --git a/debian/ostree.install b/debian/ostree.install index c686947f3..f5f31a72f 100755 --- a/debian/ostree.install +++ b/debian/ostree.install @@ -1,8 +1,18 @@ #!/usr/bin/dh-exec +etc/dracut.conf.d/ostree.conf etc/ostree +lib/systemd/system-generators/ostree-system-generator +lib/systemd/system/ostree-finalize-staged.path +lib/systemd/system/ostree-finalize-staged.service +lib/systemd/system/ostree-prepare-root.service +lib/systemd/system/ostree-remount.service usr/bin/ostree usr/bin/rofiles-fuse +usr/lib/dracut/modules.d/98ostree +usr/lib/ostree/ostree-prepare-root +usr/lib/ostree/ostree-remount +usr/lib/tmpfiles.d/ostree-tmpfiles.conf usr/share/bash-completion/completions/ostree usr/share/man usr/share/ostree/trusted.gpg.d diff --git a/debian/ostree.maintscript b/debian/ostree.maintscript deleted file mode 100644 index 5b1850ba5..000000000 --- a/debian/ostree.maintscript +++ /dev/null @@ -1,2 +0,0 @@ -rm_conffile /etc/dracut.conf.d/ostree.conf 2017.3-2~ ostree -rm_conffile /etc/grub.d/15_ostree 2017.3-2~ ostree diff --git a/debian/rules b/debian/rules index 792905fc0..c536cac1c 100755 --- a/debian/rules +++ b/debian/rules @@ -68,21 +68,8 @@ override_dh_install: rm -f debian/tmp/usr/lib/*/*.la rm -f debian/tmp/usr/libexec/installed-tests/libostree/*.la : - # TODO: when someone documents how to test these (#824649) they - # should be installed in a new ostree-boot package: see - # debian/ostree-boot.* and https://bugs.debian.org/824650 - rm -f debian/tmp/etc/dracut.conf.d/ostree.conf rm -f debian/tmp/etc/grub.d/15_ostree - rm -f debian/tmp/lib/systemd/system-generators/ostree-system-generator - rm -f debian/tmp/lib/systemd/system/ostree-finalize-staged.path - rm -f debian/tmp/lib/systemd/system/ostree-finalize-staged.service - rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service - rm -f debian/tmp/lib/systemd/system/ostree-remount.service - rm -fr debian/tmp/usr/lib/dracut/modules.d/98ostree/ rm -f debian/tmp/usr/libexec/libostree/grub2-15_ostree - rm -f debian/tmp/usr/lib/ostree/ostree-prepare-root - rm -f debian/tmp/usr/lib/ostree/ostree-remount - rm -f debian/tmp/usr/lib/tmpfiles.d/ostree-tmpfiles.conf : dh_install