diff options
Diffstat (limited to 'sysvinit')
| -rw-r--r-- | sysvinit/0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch | 35 | ||||
| -rw-r--r-- | sysvinit/PKGBUILD | 9 |
2 files changed, 41 insertions, 3 deletions
diff --git a/sysvinit/0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch b/sysvinit/0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch new file mode 100644 index 0000000..4a7392f --- /dev/null +++ b/sysvinit/0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch @@ -0,0 +1,35 @@ +From 251ed68a591cd869b4d5d15bcb7da1f24a865550 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com> +Date: Tue, 5 Nov 2013 08:15:59 +0100 +Subject: [PATCH] do not build sulogin on archlinux, it is provided by + util-linux +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Mattias Andrée <maandree@operamail.com> +--- + src/Makefile | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/Makefile b/src/Makefile +index 9e80533..1998d39 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -37,6 +37,13 @@ MAN1 += utmpdump.1 wall.1 + MAN8 += sulogin.8 bootlogd.8 + endif + ++ifeq ($(DISTRO),archlinux) ++SBIN += bootlogd ++USRBIN += utmpdump wall ++MAN1 += utmpdump.1 wall.1 ++MAN8 += bootlogd.8 ++endif ++ + ifeq ($(DISTRO),Debian) + CPPFLAGS+= -DACCTON_OFF + SBIN += sulogin bootlogd +-- +1.8.4.2 + diff --git a/sysvinit/PKGBUILD b/sysvinit/PKGBUILD index 1c34a8a..63518fe 100644 --- a/sysvinit/PKGBUILD +++ b/sysvinit/PKGBUILD @@ -9,10 +9,12 @@ license=('GPL') depends=('sysvinit-tools') source=("http://download.savannah.gnu.org/releases/sysvinit/sysvinit-${pkgver}dsf.tar.bz2" - "0001-simplify-writelog.patch" "0002-remove-ansi-escape-codes-from-log-file.patch") + "0001-simplify-writelog.patch" "0002-remove-ansi-escape-codes-from-log-file.patch" + "0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch") sha256sums=('60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519' '8126d09a35bdb9137bb19dc31b58cf1e829137fba34f7dcde7598018e1736826' - '90d38e4351ef9d77088661b411eb2b20eda435676e1e407f3d959ca2064d5c1e') + '90d38e4351ef9d77088661b411eb2b20eda435676e1e407f3d959ca2064d5c1e' + '43fed9d36b92f15bcdbde6ba2a2784a57115562795942c09dd33ff37a51cb138') build() @@ -20,6 +22,7 @@ build() cd "$srcdir/$pkgname-${pkgver}dsf" patch -p1 -d "src" -i "$srcdir/0001-simplify-writelog.patch" patch -p1 -d "src" -i "$srcdir/0002-remove-ansi-escape-codes-from-log-file.patch" + patch -p1 -i "$srcdir/0001-do-not-build-sulogin-on-archlinux-it-is-provided-by-.patch" # Patch for Arch's Linux filesystem hierarchy if [ "$(grep 'execv("/sbin/mount", args);' < src/killall5.c | wc -l)" = 1 ]; then @@ -32,7 +35,7 @@ build() sed -i 's:/bin/:/usr/bin/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} src/initscript.sample sed -i 's:/usr/usr/:/usr/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} src/initscript.sample - make + make DISTRO=archlinux } package() |