From 38aed45bad5b13f0dd952cc7e48890712b24a01c Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Thu, 20 Aug 2020 17:31:44 +0300 Subject: 9base: install rcmain to the etc directory --- community/9base/build | 2 ++ community/9base/checksums | 1 + community/9base/patches/etc-rcmain.patch | 37 ++++++++++++++++++++++++++++++++ community/9base/sources | 1 + 4 files changed, 41 insertions(+) create mode 100644 community/9base/patches/etc-rcmain.patch (limited to 'community') diff --git a/community/9base/build b/community/9base/build index d5660e1f..bcc028a4 100755 --- a/community/9base/build +++ b/community/9base/build @@ -2,5 +2,7 @@ export CFLAGS="$CFLAGS -fcommon" +patch -p1 < etc-rcmain.patch + make PREFIX=/usr make PREFIX=/usr DESTDIR="$1" install diff --git a/community/9base/checksums b/community/9base/checksums index fe9de263..c5aba979 100644 --- a/community/9base/checksums +++ b/community/9base/checksums @@ -1 +1,2 @@ git git+https://git.suckless.org/9base +2e39831e463926fb4d4b591c13d62e3031e247d1b3e6f1a23d45fd0381b412f7 etc-rcmain.patch diff --git a/community/9base/patches/etc-rcmain.patch b/community/9base/patches/etc-rcmain.patch new file mode 100644 index 00000000..5b56d222 --- /dev/null +++ b/community/9base/patches/etc-rcmain.patch @@ -0,0 +1,37 @@ +Let's put rcmain to the /etc directory instead of /usr/etc. +diff --git a/rc/Makefile b/rc/Makefile +index a6ed53b..9486968 100644 +--- a/rc/Makefile ++++ b/rc/Makefile +@@ -32,14 +32,14 @@ install: ${TARG} + @mkdir -p ${DESTDIR}${MANPREFIX}/man1 + @cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1 + @chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES} +- @mkdir -p ${DESTDIR}${PREFIX}/etc +- @cp -f rcmain ${DESTDIR}${PREFIX}/etc +- @chmod 755 ${DESTDIR}${PREFIX}/etc/rcmain ++ @mkdir -p ${DESTDIR}/etc ++ @cp -f rcmain ${DESTDIR}/etc ++ @chmod 755 ${DESTDIR}/etc/rcmain + + uninstall: + rm -f ${DESTDIR}${PREFIX}/bin/${TARG} + rm -f ${DESTDIR}${MANPREFIX}/man1/${MANFILES} +- rm -f ${DESTDIR}${PREFIX}/etc/rcmain ++ rm -f ${DESTDIR}/etc/rcmain + + .c.o: + @echo CC $*.c +diff --git a/rc/plan9ish.c b/rc/plan9ish.c +index 269d124..1ec7a88 100644 +--- a/rc/plan9ish.c ++++ b/rc/plan9ish.c +@@ -27,7 +27,7 @@ char *syssigname[]={ + char* + Rcmain(void) + { +- return unsharp("#9/etc/rcmain"); ++ return unsharp("/etc/rcmain"); + } + + char Fdprefix[]="/dev/fd/"; diff --git a/community/9base/sources b/community/9base/sources index 3c7fb8b3..9be6fb59 100644 --- a/community/9base/sources +++ b/community/9base/sources @@ -1 +1,2 @@ git+https://git.suckless.org/9base +patches/etc-rcmain.patch -- cgit v1.2.3