package/{skalibs, execline, s6*, mdevd}: root prefix

The skaware packages are frequently used as the init system and service
management for machines. Therefore it is more logical to install these
packages to the root prefix.

Signed-off-by: Dick Olsson <hi@senzilla.io>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/execline/execline.mk b/package/execline/execline.mk
index 89265a10edb68e3dd85979aeab969bba03e17357..c348d924b75fac3d815fba776a520730b78f6d3a 100644 (file)
--- a/package/execline/execline.mk
+++ b/package/execline/execline.mk
@@ -12,11 +12,11 @@ EXECLINE_INSTALL_STAGING = YES
 EXECLINE_DEPENDENCIES = skalibs
 
 EXECLINE_CONF_OPTS = \
-       --prefix=/usr \
-       --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
-       --with-include=$(STAGING_DIR)/usr/include \
-       --with-dynlib=$(STAGING_DIR)/usr/lib \
-       --with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+       --prefix=/ \
+       --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \
+       --with-include=$(STAGING_DIR)/include \
+       --with-dynlib=$(STAGING_DIR)/lib \
+       --with-lib=$(STAGING_DIR)/lib/skalibs \
        $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
        $(SHARED_STATIC_LIBS_OPTS)
 

diff --git a/package/mdevd/mdevd.mk b/package/mdevd/mdevd.mk
index 89199be8013114e60604b0ad9bf6eadf436801af..a0cd71e76e2574046092d418e5b11808295e30c9 100644 (file)
--- a/package/mdevd/mdevd.mk
+++ b/package/mdevd/mdevd.mk
@@ -12,11 +12,11 @@ MDEVD_INSTALL_STAGING = YES
 MDEVD_DEPENDENCIES = skalibs
 
 MDEVD_CONF_OPTS = \
-       --prefix=/usr \
-       --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
-       --with-include=$(STAGING_DIR)/usr/include \
-       --with-dynlib=$(STAGING_DIR)/usr/lib \
-       --with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+       --prefix=/ \
+       --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \
+       --with-include=$(STAGING_DIR)/include \
+       --with-dynlib=$(STAGING_DIR)/lib \
+       --with-lib=$(STAGING_DIR)/lib/skalibs \
        $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
        $(SHARED_STATIC_LIBS_OPTS)
 

diff --git a/package/s6-dns/s6-dns.mk b/package/s6-dns/s6-dns.mk
index e108653913f099cadc0295d3b0d16528857489f8..dfde2c29f19b0833534d46f1cc785e6f2d038465 100644 (file)
--- a/package/s6-dns/s6-dns.mk
+++ b/package/s6-dns/s6-dns.mk
@@ -12,11 +12,11 @@ S6_DNS_INSTALL_STAGING = YES
 S6_DNS_DEPENDENCIES = skalibs
 
 S6_DNS_CONF_OPTS = \
-       --prefix=/usr \
-       --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
-       --with-include=$(STAGING_DIR)/usr/include \
-       --with-dynlib=$(STAGING_DIR)/usr/lib \
-       --with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+       --prefix=/ \
+       --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \
+       --with-include=$(STAGING_DIR)/include \
+       --with-dynlib=$(STAGING_DIR)/lib \
+       --with-lib=$(STAGING_DIR)/lib/skalibs \
        $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
        $(SHARED_STATIC_LIBS_OPTS)
 

diff --git a/package/s6-linux-init/s6-linux-init.mk b/package/s6-linux-init/s6-linux-init.mk
index 2030ca78209da21a6b499827a7e4a42cbecef996..95595368de328f38156e5f0d92fa42b782298220 100644 (file)
--- a/package/s6-linux-init/s6-linux-init.mk
+++ b/package/s6-linux-init/s6-linux-init.mk
@@ -11,13 +11,13 @@ S6_LINUX_INIT_LICENSE_FILES = COPYING
 S6_LINUX_INIT_DEPENDENCIES = s6 s6-linux-utils s6-portable-utils
 
 S6_LINUX_INIT_CONF_OPTS = \
-       --prefix=/usr \
-       --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
-       --with-include=$(STAGING_DIR)/usr/include \
-       --with-dynlib=$(STAGING_DIR)/usr/lib \
-       --with-lib=$(STAGING_DIR)/usr/lib/execline \
-       --with-lib=$(STAGING_DIR)/usr/lib/s6 \
-       --with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+       --prefix=/ \
+       --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \
+       --with-include=$(STAGING_DIR)/include \
+       --with-dynlib=$(STAGING_DIR)/lib \
+       --with-lib=$(STAGING_DIR)/lib/execline \
+       --with-lib=$(STAGING_DIR)/lib/s6 \
+       --with-lib=$(STAGING_DIR)/lib/skalibs \
        $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
        $(SHARED_STATIC_LIBS_OPTS)
 

diff --git a/package/s6-linux-utils/s6-linux-utils.mk b/package/s6-linux-utils/s6-linux-utils.mk
index c050a231c29ba883689b96002b7ed51855dd646a..995ff1b855dd1b20da06113dc42aa9f2a2020b4a 100644 (file)
--- a/package/s6-linux-utils/s6-linux-utils.mk
+++ b/package/s6-linux-utils/s6-linux-utils.mk
@@ -11,11 +11,11 @@ S6_LINUX_UTILS_LICENSE_FILES = COPYING
 S6_LINUX_UTILS_DEPENDENCIES = skalibs
 
 S6_LINUX_UTILS_CONF_OPTS = \
-       --prefix=/usr \
-       --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
-       --with-include=$(STAGING_DIR)/usr/include \
-       --with-dynlib=$(STAGING_DIR)/usr/lib \
-       --with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+       --prefix=/ \
+       --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \
+       --with-include=$(STAGING_DIR)/include \
+       --with-dynlib=$(STAGING_DIR)/lib \
+       --with-lib=$(STAGING_DIR)/lib/skalibs \
        $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
        $(SHARED_STATIC_LIBS_OPTS)
 

diff --git a/package/s6-networking/s6-networking.mk b/package/s6-networking/s6-networking.mk
index 96095d104f877ae3085c3670f890e3ac0bee7c65..03807f06523e5362c2fea9f75bc0eb3b2e7fbccd 100644 (file)
--- a/package/s6-networking/s6-networking.mk
+++ b/package/s6-networking/s6-networking.mk
@@ -12,14 +12,14 @@ S6_NETWORKING_INSTALL_STAGING = YES
 S6_NETWORKING_DEPENDENCIES = s6-dns s6
 
 S6_NETWORKING_CONF_OPTS = \
-       --prefix=/usr \
-       --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
-       --with-include=$(STAGING_DIR)/usr/include \
-       --with-dynlib=$(STAGING_DIR)/usr/lib \
-       --with-lib=$(STAGING_DIR)/usr/lib/execline \
-       --with-lib=$(STAGING_DIR)/usr/lib/s6 \
-       --with-lib=$(STAGING_DIR)/usr/lib/s6-dns \
-       --with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+       --prefix=/ \
+       --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \
+       --with-include=$(STAGING_DIR)/include \
+       --with-dynlib=$(STAGING_DIR)/lib \
+       --with-lib=$(STAGING_DIR)/lib/execline \
+       --with-lib=$(STAGING_DIR)/lib/s6 \
+       --with-lib=$(STAGING_DIR)/lib/s6-dns \
+       --with-lib=$(STAGING_DIR)/lib/skalibs \
        $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
        $(SHARED_STATIC_LIBS_OPTS)
 

diff --git a/package/s6-portable-utils/s6-portable-utils.mk b/package/s6-portable-utils/s6-portable-utils.mk
index b4bed5212d1ca24939c89cc87e4ced21b4935766..fb910320ea49c9891346b957dd7288e1c0bd9b78 100644 (file)
--- a/package/s6-portable-utils/s6-portable-utils.mk
+++ b/package/s6-portable-utils/s6-portable-utils.mk
@@ -11,11 +11,11 @@ S6_PORTABLE_UTILS_LICENSE_FILES = COPYING
 S6_PORTABLE_UTILS_DEPENDENCIES = skalibs
 
 S6_PORTABLE_UTILS_CONF_OPTS = \
-       --prefix=/usr \
-       --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
-       --with-include=$(STAGING_DIR)/usr/include \
-       --with-dynlib=$(STAGING_DIR)/usr/lib \
-       --with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+       --prefix=/ \
+       --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \
+       --with-include=$(STAGING_DIR)/include \
+       --with-dynlib=$(STAGING_DIR)/lib \
+       --with-lib=$(STAGING_DIR)/lib/skalibs \
        $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
        $(SHARED_STATIC_LIBS_OPTS)
 

diff --git a/package/s6-rc/s6-rc.mk b/package/s6-rc/s6-rc.mk
index f85c8ac5e421d481df4de1e1630c7f8848b76d9f..05d798973561fa7c7f021480963143e386ab6ea3 100644 (file)
--- a/package/s6-rc/s6-rc.mk
+++ b/package/s6-rc/s6-rc.mk
@@ -12,13 +12,13 @@ S6_RC_INSTALL_STAGING = YES
 S6_RC_DEPENDENCIES = s6
 
 S6_RC_CONF_OPTS = \
-       --prefix=/usr \
-       --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
-       --with-include=$(STAGING_DIR)/usr/include \
-       --with-dynlib=$(STAGING_DIR)/usr/lib \
-       --with-lib=$(STAGING_DIR)/usr/lib/execline \
-       --with-lib=$(STAGING_DIR)/usr/lib/s6 \
-       --with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+       --prefix=/ \
+       --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \
+       --with-include=$(STAGING_DIR)/include \
+       --with-dynlib=$(STAGING_DIR)/lib \
+       --with-lib=$(STAGING_DIR)/lib/execline \
+       --with-lib=$(STAGING_DIR)/lib/s6 \
+       --with-lib=$(STAGING_DIR)/lib/skalibs \
        $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
        $(SHARED_STATIC_LIBS_OPTS)
 

diff --git a/package/s6/s6.mk b/package/s6/s6.mk
index 1a5757fe816aebcde6301207d6ec32c2f542ac99..ead82d7eaf327bdb6971a1b204b89817e8c36dce 100644 (file)
--- a/package/s6/s6.mk
+++ b/package/s6/s6.mk
@@ -12,12 +12,12 @@ S6_INSTALL_STAGING = YES
 S6_DEPENDENCIES = execline
 
 S6_CONF_OPTS = \
-       --prefix=/usr \
-       --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
-       --with-include=$(STAGING_DIR)/usr/include \
-       --with-dynlib=$(STAGING_DIR)/usr/lib \
-       --with-lib=$(STAGING_DIR)/usr/lib/execline \
-       --with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+       --prefix=/ \
+       --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \
+       --with-include=$(STAGING_DIR)/include \
+       --with-dynlib=$(STAGING_DIR)/lib \
+       --with-lib=$(STAGING_DIR)/lib/execline \
+       --with-lib=$(STAGING_DIR)/lib/skalibs \
        $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
        $(SHARED_STATIC_LIBS_OPTS)
 

diff --git a/package/skalibs/skalibs.mk b/package/skalibs/skalibs.mk
index a1d7035580f78b1fce2ed0174cddc576ceb9744e..77db57de96d653ffb82c67130fe1bba3f2b34d78 100644 (file)
--- a/package/skalibs/skalibs.mk
+++ b/package/skalibs/skalibs.mk
@@ -11,7 +11,7 @@ SKALIBS_LICENSE_FILES = COPYING
 SKALIBS_INSTALL_STAGING = YES
 
 SKALIBS_CONF_OPTS = \
-       --prefix=/usr \
+       --prefix=/ \
        --with-default-path=/sbin:/usr/sbin:/bin:/usr/bin \
        --with-sysdep-devurandom=yes \
        $(SHARED_STATIC_LIBS_OPTS)