summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kowis2011-12-20 16:44:25 -0600
committerDavid Kowis2011-12-20 16:44:25 -0600
commit97f10794554a65823c2473b0558e8da39e839be5 (patch)
treee10615fc63dd412c6fe4762fc38e456f4f02fd88
parent02ce2d98cdd26b01a9f9ad4c28254aadfc818a55 (diff)
systemd: updated more build options so that it installs correctly
-rwxr-xr-xsmgl/systemd/BUILD4
-rwxr-xr-xsmgl/systemd/CONFIGURE5
-rwxr-xr-xsmgl/systemd/DEPENDS14
-rw-r--r--smgl/systemd/HISTORY5
4 files changed, 26 insertions, 2 deletions
diff --git a/smgl/systemd/BUILD b/smgl/systemd/BUILD
index 05593aa158..ea11514733 100755
--- a/smgl/systemd/BUILD
+++ b/smgl/systemd/BUILD
@@ -1,4 +1,4 @@
-if [[ $SYSTEMD_GIT == y ]]
+if [[ "$SYSTEMD_GIT" == "y" ]]
then
./autogen.sh --prefix=${INSTALL_ROOT}/ \
--sysconfdir=${INSTALL_ROOT}/etc \
@@ -7,6 +7,7 @@ then
--infodir=${INSTALL_ROOT}/usr/share/info \
--includedir=${INSTALL_ROOT}/usr/include \
--localedir=${INSTALL_ROOT}/usr/share/locale \
+ --with-rootdir=${INSTALL_ROOT}/ \
--with-distro=other \
$OPTS
else
@@ -18,6 +19,7 @@ else
--includedir=${INSTALL_ROOT}/usr/include \
--localedir=${INSTALL_ROOT}/usr/share/locale \
--with-distro=other \
+ --with-rootdir=${INSTALL_ROOT}/ \
$OPTS
fi
make
diff --git a/smgl/systemd/CONFIGURE b/smgl/systemd/CONFIGURE
new file mode 100755
index 0000000000..751c3cb23d
--- /dev/null
+++ b/smgl/systemd/CONFIGURE
@@ -0,0 +1,5 @@
+config_query_option SYSTEMD_BINFMT "Enable binfmt tool?" y "--enable-binfmt" "--disable-binfmt" &&
+config_query_option SYSTEMD_ACL "Enable ACL support?" y "--enable-acl" "--disable-acl" &&
+config_query_option SYSTEMD_HOSTNAMED "Enable hostname daemon?" y "--enable-hostnamed" "--disable-hostnamed" &&
+config_query_option SYSTEMD_TIMEDATED "Enable timedate daemon?" y "--enable-timedated" "--disable-timedated" &&
+config_query_option SYSTEMD_LOCALED "Enable locale daemon?" y "--enable-localed" "--disable-localed"
diff --git a/smgl/systemd/DEPENDS b/smgl/systemd/DEPENDS
index d4102f6144..444e152753 100755
--- a/smgl/systemd/DEPENDS
+++ b/smgl/systemd/DEPENDS
@@ -1,4 +1,16 @@
+runtime_depends util-linux &&
+
depends udev &&
depends dbus &&
depends intltool &&
-depends libcap
+depends libcap &&
+
+optional_depends gtk+2 "--enable-gtk" "--disable-gtk" "Enable GTK tools" &&
+optional_depends linux-pam "--enable-pam" "--disable-pam" "Enable PAM support" &&
+optional_depends cryptsetup "--enable-libcryptsetup" "--disable-libcryptsetup" "Enable cryptsetup tools" &&
+optional_depends libselinux "--enable-selinux" "--disable-selinux" "Enable SELINUX support" &&
+optional_depends audit "--enable-audit" "--disable-audit" "Enable audit support" &&
+
+#the following don't have --configure options but are listed in the README
+optional_depends libnotify "" "" "Enable use of libnotify" &&
+optional_depends tcp_wrappers "--enable-tcpwrap" "--disable-tcpwrap" "Enable use of tcpwrappers"
diff --git a/smgl/systemd/HISTORY b/smgl/systemd/HISTORY
index 4cb272adb9..283c455dae 100644
--- a/smgl/systemd/HISTORY
+++ b/smgl/systemd/HISTORY
@@ -1,3 +1,8 @@
+2011-12-20 David Kowis <dkowis@shlrm.org>
+ * DEPENDS: added additional dependencies
+ * CONFIGURE: added configure options
+ * BUILD: set the root directory correctly
+
2011-12-19 David Kowis <dkowis@shlrm.org>
* DEPENDS: needs intltool to successfully build
* DETAILS: version to 37