diff --git a/pkgs/openrc/build.sh b/pkgs/openrc/build.sh index c860974..83fcbe7 100755 --- a/pkgs/openrc/build.sh +++ b/pkgs/openrc/build.sh @@ -18,9 +18,7 @@ build () { done make \ - PKG_PREFIX=/usr \ - BRANDING=\"GNU/Linux\" \ - MKNET=no + BRANDING=\"GNU/Linux\" } package () { diff --git a/pkgs/openrc/patches/force-configuration.patch b/pkgs/openrc/patches/force-configuration.patch new file mode 100644 index 0000000..21de1bc --- /dev/null +++ b/pkgs/openrc/patches/force-configuration.patch @@ -0,0 +1,51 @@ +--- mk/sys.mk 2018-11-10 03:33:17.009526366 +0200 ++++ mk/sys.mk 2018-11-10 03:33:52.383385470 +0200 +@@ -31,17 +31,17 @@ + + PICFLAG?= -fPIC + +-SYSCONFDIR?= ${PREFIX}/etc ++SYSCONFDIR?= /etc + INITDIR?= ${SYSCONFDIR}/init.d + CONFDIR?= ${SYSCONFDIR}/conf.d + CONFMODE?= 0644 + LOCALDIR?= ${SYSCONFDIR}/local.d + SYSCTLDIR?= ${SYSCONFDIR}/sysctl.d + +-BINDIR?= ${PREFIX}/bin ++BINDIR?= /usr/bin + BINMODE?= 0755 + +-SBINDIR?= ${PREFIX}/sbin ++SBINDIR?= /usr/bin + SBINMODE?= 0755 + + INCDIR?= ${UPREFIX}/include +@@ -50,11 +50,11 @@ + _LIBNAME_SH= case `readlink /lib` in /lib64|lib64) echo "lib64";; *) echo "lib";; esac + _LIBNAME:= $(shell ${_LIBNAME_SH}) + LIBNAME?= ${_LIBNAME} +-LIBDIR?= ${UPREFIX}/${LIBNAME} ++LIBDIR?= /usr/lib + LIBMODE?= 0644 +-SHLIBDIR?= ${PREFIX}/${LIBNAME} ++SHLIBDIR?= /usr/lib + +-LIBEXECDIR?= ${PREFIX}/libexec/rc ++LIBEXECDIR?= /usr/lib/openrc + + MANPREFIX?= ${UPREFIX}/share + MANDIR?= ${MANPREFIX}/man +--- src/rc/Makefile.orig 2018-11-10 03:37:59.607062743 +0200 ++++ src/rc/Makefile 2018-11-10 03:38:24.840771628 +0200 +@@ -19,8 +19,8 @@ + + CLEANFILES= version.h rc-selinux.o + +-BINDIR= ${PREFIX}/bin +-SBINDIR= ${PREFIX}/sbin ++BINDIR= /usr/bin ++SBINDIR= /usr/bin + LINKDIR= ${LIBEXECDIR} + + BINPROGS= rc-status diff --git a/pkgs/openrc/patches/utmp-macro-fix.patch b/pkgs/openrc/patches/utmp-macro-fix.patch index ef22edb..ebdaa95 100644 --- a/pkgs/openrc/patches/utmp-macro-fix.patch +++ b/pkgs/openrc/patches/utmp-macro-fix.patch @@ -1,4 +1,4 @@ ---- src/rc/broadcast.c 2018-11-10 02:53:10.148102181 +0200 +--- src/rc/broadcast.c 2018-11-10 02:53:10.148102181 +0200 +++ src/rc/broadcast.c 2018-11-10 02:53:12.858143415 +0200 @@ -29,6 +29,7 @@ #include