diff --git a/extra-repos/systemd/dsme/APKBUILD b/extra-repos/systemd/dsme/APKBUILD index 779e9835b..7943a7ca5 100644 --- a/extra-repos/systemd/dsme/APKBUILD +++ b/extra-repos/systemd/dsme/APKBUILD @@ -3,7 +3,7 @@ maintainer="Bart Ribbers " pkgname=dsme _pkgver=0.84.8 pkgver=9999$_pkgver -pkgrel=0 +pkgrel=1 _commit_dbusglib="d42176ae4763e5288ef37ea314fe58387faf2005" pkgdesc="Device State Management Entity" url="https://github.com/sailfishos/dsme" @@ -21,13 +21,11 @@ makedepends="$depends_dev libtool systemd-dev " -subpackages="$pkgname-dev $pkgname-openrc $pkgname-systemd" +subpackages="$pkgname-dev $pkgname-systemd" source="https://github.com/sailfishos/dsme/archive/$_pkgver/dsme-$_pkgver.tar.gz https://github.com/sailfishos-mirror/dbus-glib/archive/$_commit_dbusglib/dbus-glib-$_commit_dbusglib.tar.gz 0001-correct-paths.patch 0002-disable-werror.patch - dsme.initd - dsme.confd " options="!check" # Only test comes from dbus-glib and fails @@ -65,9 +63,6 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 reboot-via-dsme.sh -t "$pkgdir"/etc/profile.d/ - install -Dm755 "$srcdir"/dsme.initd "$pkgdir"/etc/init.d/dsme - install -Dm644 "$srcdir"/dsme.confd "$pkgdir"/etc/conf.d/dsme - # Remove installed tests rm -r "$pkgdir"/opt @@ -83,6 +78,4 @@ eb9b93ca23d0fb295f590a85c8ea301c74088bca50ef8788070e21b7c668fde36c763bf88aa48c33 665cd6395ee0ea14086ba30188c62a72697b3f63484681e18fc7f54109c9aca162f2e33aa2fa4d45287c6c0b590e81ca310c143dac0232cd5887692cdaf51256 dbus-glib-d42176ae4763e5288ef37ea314fe58387faf2005.tar.gz 063ce9f2bd13fb2bd05ab9cd11544265eb5378562ee1fbed1cfa65d2345d092cfcff69f57589d3914005c31a00a58f3993cc13b59615ebe0f48458ba478d8772 0001-correct-paths.patch 2b18c6affaefa786358c07480968fd744370c48452c05e969cc8b26cba5307279ce51f782f42778fbd597bf29ec3d90b7b1ee4d182e8ab41675d1070be2f1954 0002-disable-werror.patch -786971b4a8f9cff0b66db658d9b8a2c4ceaaf1c5baa4b62346b9e0a2ab6f46ff3225a60678cb7ddd78e4e9e70fbe41432581e32ebccfa4174375dc79fea49a84 dsme.initd -b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706 dsme.confd " diff --git a/extra-repos/systemd/dsme/dsme.confd b/extra-repos/systemd/dsme/dsme.confd deleted file mode 100644 index 9bd312c0c..000000000 --- a/extra-repos/systemd/dsme/dsme.confd +++ /dev/null @@ -1 +0,0 @@ -supervisor=supervise-daemon diff --git a/extra-repos/systemd/dsme/dsme.initd b/extra-repos/systemd/dsme/dsme.initd deleted file mode 100644 index 3e086d36c..000000000 --- a/extra-repos/systemd/dsme/dsme.initd +++ /dev/null @@ -1,11 +0,0 @@ -#!/sbin/openrc-run - -name="DSME" -description="Device State Management Entity" - -command=/usr/sbin/dsme -command_args="-- -p /usr/lib/dsme/startup.so" - -depend() { - need dbus -}