Cope with more files having moved to /usr/lib/libostree

This commit is contained in:
Simon McVittie 2017-03-11 12:47:53 +00:00
parent 92dbc7fbee
commit b5ec28689a
4 changed files with 8 additions and 8 deletions

View File

@ -3,6 +3,6 @@ etc/grub.d/15_ostree
lib/systemd/system/ostree-prepare-root.service lib/systemd/system/ostree-prepare-root.service
lib/systemd/system/ostree-remount.service lib/systemd/system/ostree-remount.service
usr/lib/dracut/modules.d/98ostree usr/lib/dracut/modules.d/98ostree
usr/lib/ostree/grub2-15_ostree usr/lib/libostree/grub2-15_ostree
usr/lib/ostree/ostree-prepare-root usr/lib/ostree/ostree-prepare-root
usr/lib/ostree/ostree-remount usr/lib/ostree/ostree-remount

View File

@ -1,3 +1,3 @@
usr/lib/installed-tests/libostree usr/lib/installed-tests/libostree
usr/lib/ostree/ostree-trivial-httpd usr/lib/libostree/ostree-trivial-httpd
usr/share/installed-tests/libostree usr/share/installed-tests/libostree

View File

@ -1,10 +1,10 @@
# This is deliberate: it's just some random signed file to be verified, and # This is deliberate: it's just some random signed file to be verified, and
# upstream happens to have used the text of the LGPL as the signed file # upstream happens to have used the text of the LGPL as the signed file
ostree-tests: extra-license-file usr/lib/installed-tests/ostree/gpg-verify-data/lgpl2 ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2
ostree-tests: extra-license-file usr/lib/installed-tests/ostree/gpg-verify-data/lgpl2.sig ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2.sig
# This is deliberate, working around the assumption of recursive make # This is deliberate, working around the assumption of recursive make
ostree-tests: symlink-is-self-recursive usr/lib/installed-tests/ostree/tests . ostree-tests: symlink-is-self-recursive usr/lib/installed-tests/libostree/tests .
# We won't run this on sparc64 currently # We won't run this on sparc64 currently
[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/lib/installed-tests/ostree/corrupt-repo-ref.js) [sparc64]: missing-dep-for-interpreter gjs => gjs (usr/lib/installed-tests/libostree/corrupt-repo-ref.js)

4
debian/rules vendored
View File

@ -40,7 +40,7 @@ override_dh_auto_install:
override_dh_install: override_dh_install:
rm -f debian/tmp/usr/lib/*/*.la rm -f debian/tmp/usr/lib/*/*.la
rm -f debian/tmp/usr/lib/installed-tests/ostree/*.la rm -f debian/tmp/usr/lib/installed-tests/libostree/*.la
: :
# FIXME: when someone documents how to test these (#824649) they # FIXME: when someone documents how to test these (#824649) they
# should be installed in a new ostree-boot package: see # should be installed in a new ostree-boot package: see
@ -50,7 +50,7 @@ override_dh_install:
rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service
rm -f debian/tmp/lib/systemd/system/ostree-remount.service rm -f debian/tmp/lib/systemd/system/ostree-remount.service
rm -fr debian/tmp/usr/lib/dracut/modules.d/98ostree/ 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/lib/libostree/grub2-15_ostree
rm -f debian/tmp/usr/lib/ostree/ostree-prepare-root 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/ostree/ostree-remount
: :