diff options
-rwxr-xr-x | disk/udev/BUILD | 4 | ||||
-rw-r--r-- | disk/udev/HISTORY | 16 | ||||
-rwxr-xr-x | smgl/systemd/BUILD | 25 | ||||
-rwxr-xr-x | smgl/systemd/CONFIGURE | 5 | ||||
-rwxr-xr-x | smgl/systemd/CONFLICTS | 3 | ||||
-rwxr-xr-x | smgl/systemd/DEPENDS | 16 | ||||
-rw-r--r-- | smgl/systemd/DETAILS | 31 | ||||
-rw-r--r-- | smgl/systemd/HISTORY | 21 | ||||
-rwxr-xr-x | smgl/systemd/INSTALL | 4 | ||||
-rwxr-xr-x | smgl/systemd/PREPARE | 1 | ||||
-rwxr-xr-x | smgl/systemd/PRE_BUILD | 2 | ||||
-rwxr-xr-x | smgl/systemd/PROVIDES | 1 | ||||
-rwxr-xr-x | smgl/systemd/UP_TRIGGERS | 5 | ||||
-rwxr-xr-x | utils/dbus/BUILD | 4 | ||||
-rw-r--r-- | utils/dbus/HISTORY | 3 |
15 files changed, 141 insertions, 0 deletions
diff --git a/disk/udev/BUILD b/disk/udev/BUILD index 7114acc79f..1ae0c50c26 100755 --- a/disk/udev/BUILD +++ b/disk/udev/BUILD @@ -1,3 +1,7 @@ +if spell_ok systemd; then + # if systemd is installed then we need to tell udev to install it's stuff + OPTS="$OPTS --with-systemdsystemunitdir=${INSTALL_ROOT}/lib/systemd/system" +fi && OPTS="--prefix=$INSTALL_ROOT/usr \ --sbindir=$INSTALL_ROOT/sbin \ --libexecdir=$INSTALL_ROOT/lib/udev \ diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY index b47479e573..3e69ecc0e2 100644 --- a/disk/udev/HISTORY +++ b/disk/udev/HISTORY @@ -1,3 +1,6 @@ +2011-12-20 David Kowis <dkowis@shlrm.org> +* BUILD: included logic to handle when systemd is installed + 2011-12-20 Vlad Glagolev <stealth@sourcemage.org> * kay.gpg: minimized @@ -14,6 +17,19 @@ 2011-08-30 Vlad Glagolev <stealth@sourcemage.org> * BUILD: killed another typo +2011-12-19 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 175 + new (temporary) url + * kay.gpg: added 7FAC7D56 (Kay Sievers) + see http://www.spinics.net/lists/hotplug/msg05194.html for more info + * init.d/udevd: udevd has moved + +2011-09-12 Bor Kraljič <pyrobor@ver.si> + * REPAIR^all^{,PRE}SUB_DEPENDS: use the latest version for REPAIR not some ancient + +2011-08-30 Vlad Glagolev <stealth@sourcemage.org> + * BUILD: killed another typo + 2011-07-30 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 173 diff --git a/smgl/systemd/BUILD b/smgl/systemd/BUILD new file mode 100755 index 0000000000..ea11514733 --- /dev/null +++ b/smgl/systemd/BUILD @@ -0,0 +1,25 @@ +if [[ "$SYSTEMD_GIT" == "y" ]] +then + ./autogen.sh --prefix=${INSTALL_ROOT}/ \ + --sysconfdir=${INSTALL_ROOT}/etc \ + --localstatedir=${INSTALL_ROOT}/var \ + --mandir=${INSTALL_ROOT}/usr/share/man \ + --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 + ./configure --prefix=${INSTALL_ROOT}/ \ + --sysconfdir=${INSTALL_ROOT}/etc \ + --localstatedir=${INSTALL_ROOT}/var \ + --mandir=${INSTALL_ROOT}/usr/share/man \ + --infodir=${INSTALL_ROOT}/usr/share/info \ + --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/CONFLICTS b/smgl/systemd/CONFLICTS new file mode 100755 index 0000000000..a3d06f201e --- /dev/null +++ b/smgl/systemd/CONFLICTS @@ -0,0 +1,3 @@ +#conflicts simpleinit-msb && +conflicts initng && +conflicts upstart diff --git a/smgl/systemd/DEPENDS b/smgl/systemd/DEPENDS new file mode 100755 index 0000000000..444e152753 --- /dev/null +++ b/smgl/systemd/DEPENDS @@ -0,0 +1,16 @@ +runtime_depends util-linux && + +depends udev && +depends dbus && +depends intltool && +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/DETAILS b/smgl/systemd/DETAILS new file mode 100644 index 0000000000..a647ce0df1 --- /dev/null +++ b/smgl/systemd/DETAILS @@ -0,0 +1,31 @@ + SPELL=systemd +if [[ $SYSTEMD_GIT == y ]] +then + VERSION=git + SOURCE=$SPELL-$VERSION.tar.bz2 + SOURCE_IGNORE=volatile + SOURCE_URL[0]=git://anongit.freedesktop.org/systemd + FORCE_DOWNLOAD=1 +else + VERSION=37 + SOURCE=$SPELL-$VERSION.tar.bz2 + SOURCE_HASH=sha512:c21a36860e4aa7fd7e97b53e033f436abb8237841dfe8bc20c95feb3e03a92b4270342f3102c518a80629f2a86750f6b0818c1df32cf43343368fc6ff524940f + SOURCE_URL[0]=http://www.freedesktop.org/software/${SPELL}/${SPELL}-${VERSION}.tar.bz2 +fi +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION + WEB_SITE=http://www.freedesktop.org/wiki/Software/systemd + ENTERED=20110406 + LICENSE[0]=GPL + SHORT="systemd is a system and service manager for Linux" +cat << EOF +systemd is a system and service manager for Linux, compatible with SysV and LSB +init scripts. systemd provides aggressive parallelization capabilities, uses +socket and D-Bus activation for starting services, offers on-demand starting of +daemons, keeps track of processes using Linux cgroups, supports snapshotting and +restoring of the system state, maintains mount and automount points and +implements an elaborate transactional dependency-based service control logic. +It can work as a drop-in replacement for sysvinit. + +NOTE: you need your kernel built with devtmpfs, cgroups, and optionally, but +recommended: autofs4 and ipv6. +EOF diff --git a/smgl/systemd/HISTORY b/smgl/systemd/HISTORY new file mode 100644 index 0000000000..67ccebcd6f --- /dev/null +++ b/smgl/systemd/HISTORY @@ -0,0 +1,21 @@ +2011-12-21 David Kowis <dkowis@shlrm.org> + * DETAILS: added more information to the long description and refomratted it + +2011-12-20 David Kowis <dkowis@shlrm.org> + * DEPENDS: added additional dependencies + * CONFIGURE: added configure options + * BUILD: set the root directory correctly + * INSTALL: added logic to barf out one more config file that's needed + * UP_TRIGGERS: Set the triggers to fire only if we're doing a fresh install + +2011-12-19 David Kowis <dkowis@shlrm.org> + * DEPENDS: needs intltool to successfully build + * DETAILS: version to 37 + +2011-06-13 David Kowis <dkowis@shlrm.org> + * DEPENDS: Needs libcap to successfully build + * DETAILS: Put in hash sum for version 26 + +2011-04-06 Jeremy Kajikawa <Belxjander@sourcemage.org> + * DETAILS,BUILD,HISTORY: created spell + diff --git a/smgl/systemd/INSTALL b/smgl/systemd/INSTALL new file mode 100755 index 0000000000..0fd61f7fcc --- /dev/null +++ b/smgl/systemd/INSTALL @@ -0,0 +1,4 @@ +default_install && +if ! [ -f ${INSTALL_ROOT}/etc/vconsole.conf ]; then + echo "FONT=default8x16" > ${INSTALL_ROOT}/etc/vconsole.conf +fi diff --git a/smgl/systemd/PREPARE b/smgl/systemd/PREPARE new file mode 100755 index 0000000000..52ae65bb0d --- /dev/null +++ b/smgl/systemd/PREPARE @@ -0,0 +1 @@ +config_query SYSTEMD_GIT "Use git version?" n diff --git a/smgl/systemd/PRE_BUILD b/smgl/systemd/PRE_BUILD new file mode 100755 index 0000000000..92c592cb36 --- /dev/null +++ b/smgl/systemd/PRE_BUILD @@ -0,0 +1,2 @@ +default_pre_build && +cd ${SOURCE_DIRECTORY} diff --git a/smgl/systemd/PROVIDES b/smgl/systemd/PROVIDES new file mode 100755 index 0000000000..d0e366a0cc --- /dev/null +++ b/smgl/systemd/PROVIDES @@ -0,0 +1 @@ +INIT diff --git a/smgl/systemd/UP_TRIGGERS b/smgl/systemd/UP_TRIGGERS new file mode 100755 index 0000000000..332f4d07e6 --- /dev/null +++ b/smgl/systemd/UP_TRIGGERS @@ -0,0 +1,5 @@ +# only force a rebuild on these if it's a fresh install +if ! spell_ok systemd ; then + up_trigger udev cast_self + up_trigger dbus cast_self +fi diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD index 909aeadf55..8e356ac497 100755 --- a/utils/dbus/BUILD +++ b/utils/dbus/BUILD @@ -1,3 +1,7 @@ +if spell_ok systemd; then + # if systemd is installed, then include this. Needed for systemd to work + OPTS=" --with-systemdsystemunitdir=${INSTALL_ROOT}/lib/systemd/system" +fi && if [ "$DBUS_SELINUX" == "y" ]; then OPTS="--enable-selinux $OPTS" fi && diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY index 5445fa5e7b..167835b325 100644 --- a/utils/dbus/HISTORY +++ b/utils/dbus/HISTORY @@ -1,3 +1,6 @@ +2011-12-20 David Kowis <dkowis@shlrm.org> + * BUILD: adding logic to handle installation of systemd stuff + 2011-09-26 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.4.16 * BUILD: remove make_single |