Merge branch 'ostree-boot' into 'debian/experimental'

Add ostree-boot package (#824650)

See merge request debian/ostree!1
This commit is contained in:
Simon McVittie 2019-08-27 19:24:37 +00:00
commit e786f314fc
3 changed files with 32 additions and 49 deletions

32
debian/control vendored
View File

@ -148,6 +148,38 @@ Description: content-addressed filesystem for operating system binaries
filesystem trees. It does not affect the boot process for the system
on which it is installed.
Package: ostree-boot
Architecture: linux-any
Depends:
ostree (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Recommends:
dracut,
grub-efi-amd64 | grub-pc | extlinux | syslinux | u-boot,
Breaks:
ostree (<< ${binary:Version}),
ostree-grub2 (<< ${binary:Version}),
Replaces:
ostree (<< ${binary:Version}),
ostree-grub2 (<< ${binary:Version}),
Provides:
ostree-grub2 (= ${binary:Version}),
Description: libostree boot loader and initramfs integration
libostree provides a library and tools for managing bootable, immutable,
versioned filesystem trees. See the ostree package's description for
more details.
.
This package contains configuration snippets and executables needed to
boot a Debian derivative from a libostree filesystem deployment. This
integration currently has some limitations:
.
- the initramfs must have been made using dracut
- /boot must be a separate partition
- the boot loader must be one that is supported by libostree, currently
GNU GRUB 2, syslinux/extlinux or Das U-Boot
Package: ostree-tests
Architecture: linux-any
Depends:

View File

@ -1,33 +0,0 @@
Package: ostree-boot
Architecture: linux-any
Depends:
dracut,
ostree (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Recommends:
grub-efi-amd64 | grub-pc | extlinux | syslinux | u-boot,
Breaks:
ostree (<< ${binary:Version}),
ostree-grub2 (<< ${binary:Version}),
Replaces:
ostree (<< ${binary:Version}),
ostree-grub2 (<< ${binary:Version}),
Provides:
ostree-grub2 (= ${binary:Version}),
Description: libostree boot loader and initramfs integration
libostree provides a library and tools for managing bootable, immutable,
versioned filesystem trees. See the ostree package's description for
more details.
.
This package contains configuration snippets and executables needed to
boot a Debian derivative from a libostree filesystem deployment. This
integration currently has some limitations:
.
- the initramfs must have been made using dracut
- the root filesystem must be one that dracut can mount without a root=
command-line argument (an EFI partition with the GUID defined in
the Discoverable Partitions specification)
- /boot must be a separate partition
- the boot loader must be one that is supported by libostree, currently
GNU GRUB 2, syslinux/extlinux or Das U-Boot

16
debian/rules vendored
View File

@ -67,22 +67,6 @@ 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
override_dh_missing: