aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValery Kartel <valery.kartel@gmail.com>2017-01-12 15:01:55 +0200
committerTimo Teräs <timo.teras@iki.fi>2017-02-15 06:40:10 +0000
commitfd14deba18626921a1571d2dba0f1310fbc29d4c (patch)
treeb794c68438f62f740d3130fe8828b4cd52464759
parentedcb230cb679992ceff9c178ca8079c1737598e4 (diff)
downloadaports-fd14deba18626921a1571d2dba0f1310fbc29d4c.tar.bz2
aports-fd14deba18626921a1571d2dba0f1310fbc29d4c.tar.xz
main/udev-init-scripts: upgrade to 32
- cleanups in apkbuild [TT: Removed provides]
-rw-r--r--main/udev-init-scripts/APKBUILD51
-rw-r--r--main/udev-init-scripts/openrc-run.patch10
-rw-r--r--main/udev-init-scripts/provide-dev.patch10
-rw-r--r--main/udev-init-scripts/udev-init-scripts.patch (renamed from main/udev-init-scripts/modloop.patch)12
4 files changed, 22 insertions, 61 deletions
diff --git a/main/udev-init-scripts/APKBUILD b/main/udev-init-scripts/APKBUILD
index 42536caa21..bcacb1521c 100644
--- a/main/udev-init-scripts/APKBUILD
+++ b/main/udev-init-scripts/APKBUILD
@@ -1,53 +1,32 @@
+# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=udev-init-scripts
-pkgver=30
-pkgrel=6
+pkgver=32
+pkgrel=0
pkgdesc="udev startup scripts for openrc"
url="https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/"
arch="noarch"
license="GPLv2"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-replaces="udev"
+replaces=udev
install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages=""
-source="http://dev.gentoo.org/~williamh/dist/udev-init-scripts-$pkgver.tar.gz
- provide-dev.patch
- modloop.patch
- openrc-run.patch
+source="http://dev.gentoo.org/~williamh/dist/$pkgname-$pkgver.tar.gz
+ $pkgname.patch
"
-
-_builddir="$srcdir"/udev-init-scripts-$pkgver
-prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
+builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$_builddir"
+ cd "$builddir"
make || return 1
}
package() {
- cd "$_builddir"
+ cd "$builddir"
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="2425702e7706b720866e9fc1cc4f9f34 udev-init-scripts-30.tar.gz
-ba90bb9684bf85ed1a14ecb34cf11d84 provide-dev.patch
-634e45fa76f14f1e9e3f9654063e37f4 modloop.patch
-a000a3742d04a28ba1a874f746a65928 openrc-run.patch"
-sha256sums="4de998d68e28f8ce4c1d4c9955aec0fa4cfe84673cbf3bfe1be71a1e9918693f udev-init-scripts-30.tar.gz
-41e8593ad6a4c96944880678129595282e56dbf44c8c9cad6d3a00418b786bd4 provide-dev.patch
-f987792b18204a5c6ccc13e7a2001231e6ea0e791524bec09e6192e190c9a415 modloop.patch
-52ae4ec323002db07369da37a10bfe0f27200ccfaf5a0afdb1ddcb009b4585e3 openrc-run.patch"
-sha512sums="bf9ec69d9fb9edbe37f3dec8e1d5c828ea63591382de33818297ec5e37490c2dd709a8e32251fba36a816952c98af49172c7c09f3252712ddc51820205c4efdd udev-init-scripts-30.tar.gz
-9bdbba347c361caae2f41b4617bebd1b97d70be35874b2153488bbddc00a65206741714200a94806e94df470f7e0dbcc1113e2d9194aec9fe32f96357d6465aa provide-dev.patch
-6320a73a4938ce09a61742b41bfecc26a3eb6e88fe52ca0983a0f7c2bdbc83264b4870bd9812a4cdda730b39da2a2ec9a3ad9391fde9a337054402e073b16e6a modloop.patch
-019589fdcba8273787a1e280000ecff4e964d3ace8a0f104c892f8e44d07a9bf99ccb2529b36c26eb4657ee3c6f59c3df015be8a1874725efe595fbf990d6a7e openrc-run.patch"
+md5sums="a8098437126a0ecdc23f83e923de3644 udev-init-scripts-32.tar.gz
+4b1c73084af01bea918dc246e7d691e4 udev-init-scripts.patch"
+sha256sums="d5ae437291ae140194f67fec2c9a6ceeda39708433840e7b4b0361cc5ae53eaa udev-init-scripts-32.tar.gz
+22fe7953e49b8c3d4619dc1644746ef634949ccc6ddb8959c74458b4daf1b3e2 udev-init-scripts.patch"
+sha512sums="da6291ae5c2aa1e8e41656fbe2ed6700e46360809119c0f8a26bf6c3f23f05c861b2c2943b55e47140462049474725e96105e68b204f3d931050409f34d19699 udev-init-scripts-32.tar.gz
+8f4ca4b0c7e2e51ff2e88ea724b55fe3178e5a72dfa8f0624aef5946f95f1b690f517be913bf295462866faa0085dbfac2d024982514a9d1d976ab8b79d29e06 udev-init-scripts.patch"
diff --git a/main/udev-init-scripts/openrc-run.patch b/main/udev-init-scripts/openrc-run.patch
deleted file mode 100644
index 4de96673d2..0000000000
--- a/main/udev-init-scripts/openrc-run.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/init.d/udev b/init.d/udev
-index 88c1f58..ca52b62 100644
---- a/init.d/udev
-+++ b/init.d/udev
-@@ -1,4 +1,4 @@
--#!/sbin/runscript
-+#!/sbin/openrc-run
- # Copyright 1999-2013 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
-
diff --git a/main/udev-init-scripts/provide-dev.patch b/main/udev-init-scripts/provide-dev.patch
deleted file mode 100644
index dc362cf3e0..0000000000
--- a/main/udev-init-scripts/provide-dev.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./init.d/udev.orig
-+++ ./init.d/udev
-@@ -9,6 +9,7 @@
-
- depend()
- {
-+ provide dev
- need sysfs dev-mount
- before checkfs fsck
- keyword -lxc -systemd-nspawn -vserver
diff --git a/main/udev-init-scripts/modloop.patch b/main/udev-init-scripts/udev-init-scripts.patch
index 07674cd264..d53b7d3fd7 100644
--- a/main/udev-init-scripts/modloop.patch
+++ b/main/udev-init-scripts/udev-init-scripts.patch
@@ -1,12 +1,14 @@
-diff --git a/init.d/udev b/init.d/udev
-index ef89219..88c1f58 100644
--- a/init.d/udev
+++ b/init.d/udev
-@@ -11,6 +11,7 @@ depend()
+@@ -9,9 +9,11 @@
+
+ depend()
{
- provide dev
- need sysfs dev-mount
+ use modloop
+ need sysfs dev-mount
before checkfs fsck
keyword -lxc -systemd-nspawn -vserver
++ provide dev
}
+
+ get_udevd_binary() {