Mercurial > vanilla

changeset 533:9f90de3d806f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
network: use new FHS
author David Demelier <markand@malikania.fr>
date Wed, 10 Apr 2019 20:16:00 +0200
parents 341987b63363
children 1214c226dfa0
files network/curl/curl.sh network/dbus/dbus network/dbus/dbus.sh network/dhcpcd/dhcpcd network/dhcpcd/dhcpcd.sh network/inetutils/inetutils.sh network/iproute2/iproute2.sh network/iputils/iputils.sh network/libpsl/libpsl.sh network/libsoup/libsoup.sh network/ntp/ntp.sh network/openssh/openssh.sh network/openssh/sshd network/openssl/openssl.sh network/wget/wget.sh
diffstat 15 files changed, 27 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/network/curl/curl.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/curl/curl.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -82,7 +82,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		--with-ca-bundle=/etc/ssl/cert.pem \
@@ -98,7 +98,7 @@
 		$with_ssl
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libcurl.la
+	rm -f $DESTDIR/lib/libcurl.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/network/dbus/dbus	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/dbus/dbus	Wed Apr 10 20:16:00 2019 +0200
@@ -6,7 +6,7 @@
 	source /etc/rc.conf
 fi
 
-: ${DBUS_CMD:=/usr/bin/dbus-daemon}
+: ${DBUS_CMD:=/bin/dbus-daemon}
 : ${DBUS_ARGS:=--system}
 : ${DBUS_PID:=/var/run/dbus.pid}
 
@@ -28,7 +28,7 @@
 dbus_stop()
 {
 	if [ -s $DBUS_PID ]; then
-		echo "Stopping dbus..."
+		echo "Stopping dbus."
 		kill -QUIT `cat $DBUS_PID`
 		rm -f $DBUS_PID
 	fi
--- a/network/dbus/dbus.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/dbus/dbus.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -64,9 +64,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
+		--prefix=/ \
 		--with-system-pid-file=/var/run/dbus.pid \
 		--disable-systemd \
 		--disable-static \
@@ -75,7 +73,7 @@
 		$with_x
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libdbus-1.la
+	rm -f $DESTDIR/lib/libdbus-1.la
 	install -Dm0644 ../dbus $DESTDIR/etc/rc.d/dbus
 
 	popd
--- a/network/dhcpcd/dhcpcd	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/dhcpcd/dhcpcd	Wed Apr 10 20:16:00 2019 +0200
@@ -6,7 +6,7 @@
 	. /etc/rc.conf
 fi
 
-: ${DHCPCD_CMD:=/usr/sbin/dhcpcd}
+: ${DHCPCD_CMD:=/bin/dhcpcd}
 : ${DHCPCD_ARGS:=-q -b}
 : ${DHCPCD_PID:=/var/run/dhcpcd.pid}
 
--- a/network/dhcpcd/dhcpcd.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/dhcpcd/dhcpcd.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -26,7 +26,6 @@
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
-: ${CTARGET:=$(uname -m)-linux-musl}
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}
@@ -46,9 +45,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--target=$CTARGET \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
--- a/network/inetutils/inetutils.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/inetutils/inetutils.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -42,9 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
+		--prefix=/ \
 		--without-pam \
 		--disable-rcp \
 		--disable-rlogin \
--- a/network/iproute2/iproute2.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/iproute2/iproute2.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -68,7 +68,7 @@
 
 	patch -p0 < ../musl.patch
 	make CC="$CC"
-	make SBINDIR=/usr/sbin DESTDIR=$DESTDIR install
+	make SBINDIR=/bin DESTDIR=$DESTDIR install
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/network/iputils/iputils.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/iputils/iputils.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -54,9 +54,9 @@
 
 	# https://git.alpinelinux.org/aports/tree/main/iputils/fix-defines.patch
 	patch -p1 < ../fix-defines.patch
-	make CC="$CC" CFLAGS="$CFLAGS" USE_NETTLE=no KERNEL_INCLUDE=/usr/include $mflags
+	make CC="$CC" CFLAGS="$CFLAGS" USE_NETTLE=no KERNEL_INCLUDE=/include $mflags
 	for p in arping clockdiff ipg ping rarpd rdisc tftpd tracepath traceroute6; do
-		install -D -m 0755 $p $DESTDIR/usr/bin/$p
+		install -D -m 0755 $p $DESTDIR/bin/$p
 	done
 
 	popd
--- a/network/libpsl/libpsl.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/libpsl/libpsl.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -43,12 +43,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libpsl.la
+	rm -f $DESTDIR/lib/libpsl.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/network/libsoup/libsoup.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/libsoup/libsoup.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -61,7 +61,7 @@
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	meson \
-		--prefix /usr \
+		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		$with_gnome \
--- a/network/ntp/ntp.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/ntp/ntp.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -67,7 +67,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_cap \
 		$with_ipv6 \
 		$with_nls
--- a/network/openssh/openssh.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/openssh/openssh.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -65,7 +65,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--sysconfdir=/etc/ssh \
 		--with-pid-dir=/var/run \
 		$with_pam \
--- a/network/openssh/sshd	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/openssh/sshd	Wed Apr 10 20:16:00 2019 +0200
@@ -3,26 +3,26 @@
 # /etc/rc.d/sshd: run control script for sshd
 
 if [ -f /etc/rc.conf ]; then
-	source /etc/rc.conf
+	. /etc/rc.conf
 fi
 
-: ${SSHD_CMD:=/usr/sbin/sshd}
+: ${SSHD_CMD:=/bin/sshd}
 : ${SSHD_ARGS:=}
 : ${SSHD_PID:=/var/run/sshd.pid}
 
 sshd_start()
 {
 	if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-		/usr/bin/ssh-keygen -q -t rsa -b 2048 -N "" -f /etc/ssh/ssh_host_rsa_key
+		/bin/ssh-keygen -q -t rsa -b 2048 -N "" -f /etc/ssh/ssh_host_rsa_key
 	fi
 	if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
-		/usr/bin/ssh-keygen -q -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key
+		/bin/ssh-keygen -q -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key
 	fi
 	if [ ! -f /etc/ssh/ssh_host_ecdsa_key ]; then
-		/usr/bin/ssh-keygen -q -t ecdsa -b 521 -N "" -f /etc/ssh/ssh_host_ecdsa_key
+		/bin/ssh-keygen -q -t ecdsa -b 521 -N "" -f /etc/ssh/ssh_host_ecdsa_key
 	fi
 	if [ ! -f /etc/ssh/ssh_host_ed25519_key ]; then
-		/usr/bin/ssh-keygen -q -t ed25519 -N "" -f /etc/ssh/ssh_host_ed25519_key
+		/bin/ssh-keygen -q -t ed25519 -N "" -f /etc/ssh/ssh_host_ed25519_key
 	fi
 
 	echo "Starting sshd: $SSHD_CMD $SSHD_ARGS"
@@ -41,7 +41,7 @@
 sshd_stop()
 {
 	if [ -s $SSHD_PID ]; then
-		echo "Stopping sshd..."
+		echo "Stopping sshd."
 		kill -QUIT $SSHD_PID
 	fi
 }
--- a/network/openssl/openssl.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/openssl/openssl.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -45,7 +45,7 @@
 
 	patch -p0 < ../ca-directory.patch
 	./Configure \
-		--prefix=/usr \
+		--prefix=/ \
 		--openssldir=/etc/ssl \
 		--libdir=lib \
 		shared linux-x86_64
@@ -53,7 +53,7 @@
 	make depend
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/lib{crypto,ssl}.a
+	rm -f $DESTDIR/lib/lib{crypto,ssl}.a
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/network/wget/wget.sh	Wed Apr 10 20:14:00 2019 +0200
+++ b/network/wget/wget.sh	Wed Apr 10 20:16:00 2019 +0200
@@ -71,7 +71,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--without-included-libunistring \
 		$with_nls \
 		$with_ssl \