From 9572f7e4f2f9045a0bdc1b621e1e779bbda62e69 Mon Sep 17 00:00:00 2001
From: Felix Krull <f_krull@gmx.de>
Date: Wed, 29 Aug 2018 18:22:49 +0200
Subject: [PATCH] Enable ostree-boot package

---
 debian/control             | 32 ++++++++++++++++++++++++++++++++
 debian/ostree-boot.control | 33 ---------------------------------
 debian/rules               | 16 ----------------
 3 files changed, 32 insertions(+), 49 deletions(-)
 delete mode 100644 debian/ostree-boot.control

diff --git a/debian/control b/debian/control
index 85b318d9..8d7e9334 100644
--- a/debian/control
+++ b/debian/control
@@ -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:
+ 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
+  - /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:
diff --git a/debian/ostree-boot.control b/debian/ostree-boot.control
deleted file mode 100644
index 8d51a694..00000000
--- a/debian/ostree-boot.control
+++ /dev/null
@@ -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
diff --git a/debian/rules b/debian/rules
index 021b1e8a..934e0341 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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: