Skip to content

Commit

Permalink
Restore ostree-boot files to main ostree package
Browse files Browse the repository at this point in the history
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
  • Loading branch information
GeorgesStavracas authored and mwleeds committed Jan 22, 2019
1 parent a711f7f commit 4705bb8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
10 changes: 10 additions & 0 deletions debian/ostree.install
Original file line number Diff line number Diff line change
@@ -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 <!nodoc>
usr/share/ostree/trusted.gpg.d
2 changes: 0 additions & 2 deletions debian/ostree.maintscript

This file was deleted.

13 changes: 0 additions & 13 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 4705bb8

Please sign in to comment.