diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-08-17 17:22:27 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-08-17 17:28:56 +0200 |
| commit | d3b164f5698109f945623cdcbbea944a52888bac (patch) | |
| tree | b05662efca1b1f7210ec9931b75ffc3086defe56 /main | |
| parent | da446ba1df70e700a433ba0a2d9574d85e643925 (diff) | |
| download | aports-d3b164f5698109f945623cdcbbea944a52888bac.tar.bz2 aports-d3b164f5698109f945623cdcbbea944a52888bac.tar.xz | |
main/openrc: busybox swapon applet supports -e now
https://git.busybox.net/busybox/commit/util-linux/swaponoff.c?id=e76957708b6a158fd25f7298a4bf2cc5583a974a
Diffstat (limited to 'main')
| -rw-r--r-- | main/openrc/APKBUILD | 22 | ||||
| -rw-r--r-- | main/openrc/swap-ifexists.patch | 13 |
2 files changed, 7 insertions, 28 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index a097640a7f..5022f8eeaa 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -2,7 +2,7 @@ pkgname=openrc pkgver=0.21.3 _ver=${pkgver/_git*/} -pkgrel=1 +pkgrel=2 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" arch="all" @@ -17,7 +17,6 @@ source="openrc-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgver. 0001-Force-root-be-rw-before-localmount.patch 0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch swap-umount-tmpfs.patch - swap-ifexists.patch hide-migrate-to-run-error.patch rc-pull-in-sysinit-and-boot-as-stacked-levels-when-needed.patch read-only-efivars.patch @@ -35,24 +34,20 @@ source="openrc-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgver. sysfsconf.initd " -_builddir="$srcdir/$pkgname-$_ver" +builddir="$srcdir/$pkgname-$_ver" prepare() { - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1 - esac - done - sed -i -e '/^sed/d' pkgconfig/Makefile + default_prepare || return 1 + sed -i -e '/^sed/d' "$builddir"/pkgconfig/Makefile \ + || return 1 } build() { - cd "$_builddir" + cd "$builddir" make LIBEXECDIR=/lib/rc || return 1 } package() { - cd "$_builddir" + cd "$builddir" make LIBEXECDIR=/lib/rc DESTDIR="$pkgdir/" install # we cannot have anything turned on by default @@ -82,7 +77,6 @@ md5sums="a93cb29a001d7439b0e85596bd325717 openrc-0.21.3.tar.gz 4fd036ff07ed9ad7fb76af6a3ffc0695 0001-Force-root-be-rw-before-localmount.patch f5bcedf55f440767a0b93d9f9cd2860d 0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch c2af5e52da614a6cef02d1e4d537e360 swap-umount-tmpfs.patch -1c426b84d13a725ad493647b5253f239 swap-ifexists.patch 679c559aa54f9e855cd735866eeaaad6 hide-migrate-to-run-error.patch db45dc04a50d48a0c377e9de3ee0008b rc-pull-in-sysinit-and-boot-as-stacked-levels-when-needed.patch 1f4d1fed897e8dd42b459952c63933d2 read-only-efivars.patch @@ -102,7 +96,6 @@ c807aed11d7eb42de5c421a6d117532f6215697f159f40cb3404bdc80270bee1 openrc-0.4.3-m e869e2076c10a7134f5d9e4ae4a5d09ca35c6333d400556f1e329170d2e58066 0001-Force-root-be-rw-before-localmount.patch bdccc12593d9bb9df6fcff57a56e4100ae43e052d6eff87f561966653ca071dc 0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch 84d67ed2cf050e20f52d4ea048e7452e78356ba02b396d8c064a4458c0811ea4 swap-umount-tmpfs.patch -8978b00492d90b573f5254cc394582e8f1a5cd8b4d6c928fa0a9a022dd17fe9c swap-ifexists.patch 786580df90a5a75087e5adfd395d160dee2df4b994e0938e8524198aeaf2d774 hide-migrate-to-run-error.patch cb4ff88875c0125b68fe567cc41b42743499bbdc90a5c9dfe2b92883b5b05111 rc-pull-in-sysinit-and-boot-as-stacked-levels-when-needed.patch 61abfab5a0100ea1ea706bf50712cb38f107516c2856a1278fb9364bdde216c0 read-only-efivars.patch @@ -122,7 +115,6 @@ eee27fbf72776fb70d3aa6c6464180731d522191e5755aa431ab09ea11dd11bf001a95618adcaa5c 51c77be5ab726d50ef1d0b9dab644edef1ff739e855e3a12ab27beada8911998e0c6a7491eb92df621dcdb633b672d933a4edc00115ec43bdf1271105239ebb7 0001-Force-root-be-rw-before-localmount.patch 1c01874aebab74c18c70c1869b074ce1069ac43637340097e4f16741bd6b4771bc9506b25482f10e2b597f73ad2ea57434acb61ed38fca72017aed96b13e45fa 0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch 8fd442d372401740b1c523367c928f49efa8179604aac2b517cdc4264daf303056d5a5e0a2c996db5e6ef9b7cdd0619a16cfabc15c3399e322384844e2a36542 swap-umount-tmpfs.patch -c5b8806c693b0ea48ff87e0e3669304f5c2f95954ad54814889047a933f367081a8c8d3bb771dd1ed6c3bc845df894232bd6b662066d09eba3abf3964187d1d1 swap-ifexists.patch 750e3305913d3f6fa6baa0b34b851fe17aacb922e864b95ec9b4b451e8e3c16d0c10686a12f4c7cb9b5d05894e1d89b0dac3beed19b1223d3fbc672f25769145 hide-migrate-to-run-error.patch a3c2f419a3d475519cc8f78bd3baa26cae90a492a5fc92308b18931889db10452aa33324cca8489058d2bcf720e67ab9163ada090d3d3f54ab55dbd758901d4a rc-pull-in-sysinit-and-boot-as-stacked-levels-when-needed.patch 2e4c9edb51c4220684ee39102e048df0a6a4f10ddea0e9e5b7f9323240c47181de0048b23fe49c23221f9c78663e7336deb70d9c8eccdc9ce3eb86b51e009f1f read-only-efivars.patch diff --git a/main/openrc/swap-ifexists.patch b/main/openrc/swap-ifexists.patch deleted file mode 100644 index 65ab2978c8..0000000000 --- a/main/openrc/swap-ifexists.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/init.d/swap.in b/init.d/swap.in -index 9e8ddbd..2bf5614 100644 ---- a/init.d/swap.in -+++ b/init.d/swap.in -@@ -12,7 +12,7 @@ start() - { - ebegin "Activating swap devices" - case "$RC_UNAME" in -- Linux) swapon -a -e >/dev/null;; -+ Linux) swapon -a >/dev/null;; - NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;; - *) swapon -a >/dev/null;; - esac |