summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2013-08-22 16:32:36 +0200
committerJonathan Bauer2013-08-22 16:32:36 +0200
commitfaff0f925ea99662cefb649c81ea22bc346ec13c (patch)
tree913379bef9cc26913396901908a0ed38b6b6856c
parent[rootfs-stage32] unmount sqfs if the aufs'ing of the addon fails. (diff)
downloadtm-scripts-faff0f925ea99662cefb649c81ea22bc346ec13c.tar.gz
tm-scripts-faff0f925ea99662cefb649c81ea22bc346ec13c.tar.xz
tm-scripts-faff0f925ea99662cefb649c81ea22bc346ec13c.zip
[plymouth] moved plymouth stuff to /usr. Uses PREFIX from the config file
-rw-r--r--remote/modules/plymouth/plymouth.build3
-rw-r--r--remote/modules/plymouth/plymouth.conf13
2 files changed, 9 insertions, 7 deletions
diff --git a/remote/modules/plymouth/plymouth.build b/remote/modules/plymouth/plymouth.build
index 1346f087..e46541f3 100644
--- a/remote/modules/plymouth/plymouth.build
+++ b/remote/modules/plymouth/plymouth.build
@@ -7,7 +7,8 @@ fetch_source() {
build() {
cd src/$VERSION
pinfo "Running configure"
- ./configure --enable-systemd-integration --disable-gtk --disable-static --prefix=""|| perror "failed."
+
+ ./configure --enable-systemd-integration --disable-gtk --disable-static --prefix="$PREFIX"|| perror "failed."
pinfo "Running make"
make || perror "failed"
pinfo "Running make install"
diff --git a/remote/modules/plymouth/plymouth.conf b/remote/modules/plymouth/plymouth.conf
index ec6f8571..d9acf6a3 100644
--- a/remote/modules/plymouth/plymouth.conf
+++ b/remote/modules/plymouth/plymouth.conf
@@ -1,14 +1,15 @@
VERSION=plymouth-0.8.6.1
URL=http://www.freedesktop.org/software/plymouth/releases/${VERSION}.tar.bz2
+PREFIX="/usr"
REQUIRED_BINARIES="
plymouth
plymouthd
"
REQUIRED_DIRECTORIES="
- /bin
- /etc
- /lib
- /sbin
- /var/lib
- /var/spool
+ $PREFIX/bin
+ $PREFIX/etc
+ $PREFIX/lib
+ $PREFIX/sbin
+ $PREFIX/var/lib
+ $PREFIX/var/spool
"