From 5e30fe4bb944b3ad8b645df497a39091052192bd Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 8 Jun 2016 21:04:59 +0100 Subject: [PATCH] Remove ostree-grub2 and the boot-related parts of ostree This leaves behind the library and the command-line tool, which are also used by Flatpak. When we have documentation for how to use and test OSTree deployments with a Debian derivative (see #824649), they should be reinstated in an ostree-boot package (see #824650). --- debian/changelog | 8 ++++++-- debian/control | 33 --------------------------------- debian/ostree-boot.control | 32 ++++++++++++++++++++++++++++++++ debian/rules | 13 +++++++++++++ 4 files changed, 51 insertions(+), 35 deletions(-) create mode 100644 debian/ostree-boot.control diff --git a/debian/changelog b/debian/changelog index 9ba51ce3..77186cd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ ostree (2016.5-3) UNRELEASED; urgency=medium - * Rename ostree-grub2 to ostree-boot. Move all initramfs and bootloader - integration there. (Closes: #824650) + * Remove ostree-grub2 and the boot-related parts of ostree, leaving + the library and the command-line tool, which are also used by + Flatpak. + When we have documentation for how to use and test OSTree + deployments with a Debian derivative (see #824649), they should be + reinstated in an ostree-boot package (see #824650). -- Simon McVittie Wed, 08 Jun 2016 11:58:01 +0100 diff --git a/debian/control b/debian/control index 33bd6aa4..3b4a657e 100644 --- a/debian/control +++ b/debian/control @@ -127,39 +127,6 @@ 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: - 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: ostree boot loader and initramfs integration - OSTree is a tool 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 using OSTree. 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 ostree, currently - GNU GRUB 2, syslinux/extlinux or Das U-Boot - Package: ostree-tests Architecture: linux-any Depends: diff --git a/debian/ostree-boot.control b/debian/ostree-boot.control new file mode 100644 index 00000000..ac76885c --- /dev/null +++ b/debian/ostree-boot.control @@ -0,0 +1,32 @@ +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: ostree boot loader and initramfs integration + OSTree is a tool 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 using OSTree. 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 ostree, currently + GNU GRUB 2, syslinux/extlinux or Das U-Boot diff --git a/debian/rules b/debian/rules index 1141b41a..2c6fae10 100755 --- a/debian/rules +++ b/debian/rules @@ -47,6 +47,19 @@ override_dh_auto_install: override_dh_install: rm -f debian/tmp/usr/lib/*/*.la rm -f debian/tmp/usr/lib/installed-tests/ostree/*.la + : + # FIXME: 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/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/lib/ostree/grub2-15_ostree + rm -f debian/tmp/usr/sbin/ostree-prepare-root + rm -f debian/tmp/usr/sbin/ostree-remount + : dh_install --fail-missing override_dh_makeshlibs: