summaryrefslogtreecommitdiffstats
path: root/remote/tools/policykit
diff options
context:
space:
mode:
authorJonathan Bauer2013-03-13 17:34:54 +0100
committerJonathan Bauer2013-03-13 17:34:54 +0100
commit28ffb58acc9ee84bc2ff78f0f9c6593b1f86e7a6 (patch)
tree0856ea5a4b0942236041e994d93982b49b70b4cb /remote/tools/policykit
parentplymouth for stage3.1 (diff)
parentdelete data/stage3.1. It can be found under remote/stage3.1 now. (diff)
downloadtm-scripts-28ffb58acc9ee84bc2ff78f0f9c6593b1f86e7a6.tar.gz
tm-scripts-28ffb58acc9ee84bc2ff78f0f9c6593b1f86e7a6.tar.xz
tm-scripts-28ffb58acc9ee84bc2ff78f0f9c6593b1f86e7a6.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/tools/policykit')
-rw-r--r--remote/tools/policykit/policykit.build33
-rw-r--r--remote/tools/policykit/policykit.conf15
2 files changed, 16 insertions, 32 deletions
diff --git a/remote/tools/policykit/policykit.build b/remote/tools/policykit/policykit.build
index 72d7f246..08f89290 100644
--- a/remote/tools/policykit/policykit.build
+++ b/remote/tools/policykit/policykit.build
@@ -2,37 +2,16 @@
fetch_source () {
- [ ! -e .fetched_source ] && download_untar "$URL" "src/"
- touch .fetched_source
+ pinfo "Extracting from running system..."
}
build () {
- BUILDDIR=$TOOL_DIR/$TOOL/build
+ BUILDDIR="${TOOL_DIR}/${TOOL}/build"
+ COPYLIST="list_dpkg_output"
+ [ -e "${COPYLIST}" ] && rm "${COPYLIST}"
- if [ ! -e .built ]; then
- cd src/$VERSION
-
- [ ! -d "${TOOL_DIR}/systemd/build" ] && perror "systemd build directory not found. Build it first."
- pinfo "configuring..."
- LIBSYSTEMD_LOGIN_LIBS="-L${TOOL_DIR}/systemd/build/usr/lib/" \
- LIBSYSTEMD_LOGIN_CFLAGS="-I${TOOL_DIR}/systemd/build/usr/include -I${TOOL_DIR}/systemd/build/usr/include/systemd -lsystemd-login -lsystemd-daemon" \
- ./configure --enable-libsystemd-login=yes --with-systemdsystemunitdir=/etc/systemd/system -prefix="/" --datarootdir="/usr/share" --enable-man-pages=no --enable-gtk-doc-html=no --enable-examples=no --enable-static=no
- pinfo "calling make..."
- make || perror "make failed."
- [ ! -d "$BUILDDIR" ] && mkdir -p "$BUILDDIR"
- pinfo "installing to $BUILDDIR..."
- DESTDIR="$BUILDDIR" make install || perror "make install failed..."
-
- COPYLIST="list_dpkg_output"
- [ -e "$COPYLIST" ] && rm "$COPYLIST"
-
- list_packet_files >> "$COPYLIST"
- tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
-
- cd -
- touch .built
-
- fi
+ list_packet_files >> "${COPYLIST}"
+ tarcopy "$(cat "${COPYLIST}" | sort -u)" "${BUILDDIR}"
}
post_copy() {
diff --git a/remote/tools/policykit/policykit.conf b/remote/tools/policykit/policykit.conf
index fbf997f6..cb16bc79 100644
--- a/remote/tools/policykit/policykit.conf
+++ b/remote/tools/policykit/policykit.conf
@@ -1,9 +1,14 @@
VERSION=polkit-0.110
URL=http://www.freedesktop.org/software/polkit/releases/polkit-0.110.tar.gz
-REQUIRED_DEPENDENCIES="libmozjs185-dev"
-REQUIRED_PACKAGES=""
+REQUIRED_DEPENDENCIES="libmozjs185-1.0"
+REQUIRED_PACKAGES="libmozjs185-1.0 policykit-1"
REQUIRED_BINARIES=""
-REQUIRED_DIRECTORIES="/bin /etc /lib /usr/share/dbus-1 /usr/share/polkit-1"
+REQUIRED_DIRECTORIES=" /etc/pam.d /etc/dbus-1 /etc/polkit-1
+ /usr/bin
+ /usr/share/dbus-1
+ /usr/share/polkit-1
+ /usr/lib/policykit-1
+ /usr/lib/i386-linux-gnu/polkit-1
+ /lib/systemd/system"
REQUIRED_FILES=""
-REQUIRED_MODULES="systemd"
-
+REQUIRED_LIBRARIES="libmozjs185"