Permalink
Browse files

Merge branch 'master' of github.com:/lunar-linux/moonbase-core

  • Loading branch information...
ahkok committed Jul 11, 2012
2 parents d7a03af + a869dd9 commit ef97271fa97af0cbf74b56ef5610d7db7336a014
View
@@ -1,3 +1,5 @@
%KERNEL_HEADERS:kernel-headers kernel-headers-2.6
%KMOD:kmod module-init-tools
+%SSL:openssl gnutls
%UDEV:systemd udev
+%XMLRENDERER:libxml2 expat
View
@@ -21,9 +21,9 @@
--enable-applib \
--enable-udev_sync \
--enable-udev_rules \
- --enable-static_link \
$OPTS &&
- default_make
+ default_make &&
+ make install_system_dirs
) > $C_FIFO 2>&1
@@ -17,9 +17,9 @@
--enable-applib \
--enable-udev_sync \
--enable-udev_rules \
- --enable-static_link \
$OPTS &&
- default_make
+ default_make &&
+ make install_system_dirs
) > $C_FIFO 2>&1
View
@@ -1 +1,3 @@
depends readline
+depends pkgconfig
+depends %UDEV
@@ -0,0 +1,17 @@
+[Unit]
+Description=Device-mapper event daemon
+Requires=dm-event.socket
+After=dm-event.socket
+Before=local-fs.target
+DefaultDependencies=no
+
+[Service]
+Type=forking
+ExecStart=/sbin/dmeventd
+ExecReload=/sbin/dmeventd -R
+Environment=SD_ACTIVATION=1
+PIDFile=/var/run/dmeventd.pid
+OOMScoreAdjust=-1000
+
+[Install]
+WantedBy=sysinit.target
@@ -0,0 +1,11 @@
+[Unit]
+Description=Device-mapper event daemon FIFOs
+DefaultDependencies=no
+
+[Socket]
+ListenFIFO=/var/run/dmeventd-server
+ListenFIFO=/var/run/dmeventd-client
+SocketMode=0600
+
+[Install]
+WantedBy=sockets.target
@@ -0,0 +1,2 @@
+d /var/lock/lvm 0700 root root -
+d /var/run/lvm 0700 root root -
View
@@ -1,4 +1,3 @@
-depends glib-2
depends zlib
depends automake
depends libtool
View
@@ -2,12 +2,23 @@
# Do not remove --enable-debug=minimum, it will break some common
# API functions if debug is entirely disabled
- export OPTS+=" --disable-static --enable-shared --enable-debug=minimum" &&
+ export OPTS+=" --disable-static --enable-shared --enable-debug=minimum --disable-fam" &&
- if [ "`get_module_config DOCS`" = "n" ] ; then
- sedit "s/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g" Makefile.in
+ if [ "$DOCS" = "n" ] || ! in_depends $MODULE Python; then
+ sedit "s;^\(.*\SUBDIRS .*\=.*\)docs\(.*\)$;\1\2;" Makefile.in
+ sedit "s;^\(.*\SUBDIRS .*\=.*\)docs\(.*\)$;\1\2;" Makefile.am
fi &&
+ # Don't build tests if we don't have python
+ # Tests are required if docs are built
+ if ! in_depends $MODULE Python && [ "$DOCS" = "n" ]; then
+ for i in $(find . -name Makefile.in -o -name Makefile.am); do
+ sedit "s;^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$;\1\2;" $i
+ done
+ fi &&
+
+ patch_it $SOURCE2 1 &&
+ AT_M4DIR=. autoreconf &&
default_build
) > $C_FIFO 2>&1
View
@@ -1,3 +1,3 @@
-depends zlib
-depends libffi
-depends Python
+depends zlib
+depends libffi
+optional_depends Python "" "" "build tests (for docs also say yes here)?"
View
@@ -1,13 +1,16 @@
MODULE=glib-2
VERSION=32.3
SOURCE=$MODULE.$VERSION.tar.xz
+ SOURCE2=glib-2.31.x-external-gdbus-codegen.patch
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE.$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/glib/${MODULE#*-}.${VERSION%.*}
SOURCE_URL[1]=ftp://ftp.gtk.org/pub/glib/${MODULE#*-}.${VERSION%.*}
+ SOURCE2_URL=$PATCH_URL
SOURCE_VFY=sha1:429355327aaf69d2c21cbefcb20c61db94e0acec
+ SOURCE2_VFY=sha1:6625bbb01a5b39970a28f78503bcc58e13cd5297
WEB_SITE=http://library.gnome.org/devel/glib
ENTERED=20020313
- UPDATED=20120515
+ UPDATED=20120711
SHORT="A library of useful C routines for trees, hashes, and lists"
cat << EOF
View
@@ -7,37 +7,23 @@
--enable-split-usr \
--disable-tcpwrap"
- # gtk is broken currently
- OPTS+=" --disable-gtk"
-
if module_installed Linux-PAM; then
OPTS+=" --with-pamlibdir=/lib/security"
fi
- # just adding some files which are useful to
- # systemd
- # todo: some info-message to the user, that
- # he/she should adjust /etc/hostname,
- # /etc/vconsole.conf and /etc/locale.conf
- # could be useful.
-
# a not existing hostname is set to lunar.
- [ ! -f /etc/hostname ] && install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/hostname /etc/hostname
+ [ -f /etc/hostname ] || install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/hostname /etc/hostname &&
# vconsole.conf defaults to us-layout
- [ ! -f /etc/vconsole.conf ] && install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/vconsole.conf /etc/vconsole.conf
+ [ -f /etc/vconsole.conf ] || install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/vconsole.conf /etc/vconsole.conf &&
# os-release should properly show lunar
# todo: we might replace this with some auto-generated
# values from /etc/lunar.release in the future.
- [ ! -f /etc/os-release ] && install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/os-release /etc/os-release
+ [ -f /etc/os-release ] || install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/os-release /etc/os-release &&
# last but not least the locale settings, defaulting to US
- [ ! -f /etc/locale.conf ] && install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/locale.conf /etc/locale.conf
-
- patch_it $SOURCE2 1 &&
- patch_it $SOURCE3 1 &&
- patch_it $SOURCE4 1 &&
+ [ -f /etc/locale.conf ] || install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/locale.conf /etc/locale.conf &&
# systemd guys wrongly assume that on every linux
# installation is a group called "lock" this isn't
@@ -53,6 +39,9 @@
lrm --upgrade udev
fi &&
- make install
+ make install &&
+
+ # Always install the legacy.conf file even if SysV compatibility isn't enabled
+ install -m 0644 -o root -g root tmpfiles.d/legacy.conf /usr/lib/tmpfiles.d
) > $C_FIFO 2>&1
View
@@ -1,20 +1,11 @@
MODULE=systemd
- VERSION=185
+ VERSION=186
SOURCE=$MODULE-$VERSION.tar.xz
- SOURCE2=0001-Reinstate-TIMEOUT-handling.patch
- SOURCE3=0001-udev-systemd-udev-settle.service-fix-After.patch
- SOURCE4=0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
SOURCE_URL=http://www.freedesktop.org/software/systemd
- SOURCE2_URL=$PATCH_URL
- SOURCE3_URL=$PATCH_URL
- SOURCE4_URL=$PATCH_URL
- SOURCE_VFY=sha1:1038b5c7c6be99e59af94c74c8b6476e19c89166
- SOURCE2_VFY=sha1:a6539821cc493ce282013d79de8b5db3ec1003ac
- SOURCE3_VFY=sha1:8b5cdb6e37b6ff47cb08eed9446e3c6c36297369
- SOURCE4_VFY=sha1:bc3af38048845fa929bb2cec8d9518af6d23bf2e
+ SOURCE_VFY=sha1:abf25fac986a2fc34a4bcc93fd5481f74e822cc7
WEB_SITE=http://www.freedesktop.org/wiki/Software/systemd
ENTERED=20100919
- UPDATED=20120701
+ UPDATED=20120710
SHORT="A system and program management daemon"
cat << EOF
@@ -1,3 +1,49 @@
-lin -c dbus
# generate the machine id
/usr/bin/systemd-machine-id-setup
+
+# systemd readyness checks
+if [ ! -f /etc/machine-id ]; then
+ SYSTEMD_ERROR=1
+ message "\n${PROBLEM_COLOR}WARNING: ${MESSAGE_COLOR} File ${FILE_COLOR}/etc/machine-id${MESSAGE_COLOR} not found."
+ message "${MESSAGE_COLOR}To manually create /etc/machine-id run 'systemd-machine-id-setup' or 'dbus-uuidgen --ensure=/etc/machine-id'"
+fi
+
+if [ ! -L /etc/mtab ]; then
+ SYSTEMD_ERROR=1
+ message "\n${PROBLEM_COLOR}WARNING: ${FILE_COLOR}/etc/mtab${MESSAGE_COLOR} is not a symlink."
+ message "${MESSAGE_COLOR}To manually create a symlink to /proc/self/mounts run 'rm -f /etc/mtab; ln -s /proc/self/mounts /etc/mtab'"
+fi
+
+if [ ! -L /var/run ]; then
+ SYSTEMD_ERROR=1
+ message "\n${PROBLEM_COLOR}WARNING: ${FILE_COLOR}/var/run${MESSAGE_COLOR} is not a symlink."
+ if mountpoint -q /var/run; then
+ message "${MESSAGE_COLOR}To manually create a symlink to /run run 'umount /var/run; rm -rf /var/run; ln -s ../run /var/run'"
+ else
+ message "${MESSAGE_COLOR}To manually create a symlink to /run run 'rm -rf /var/run; ln -s ../run /var/run'"
+ fi
+fi
+
+if [ ! -L /var/lock ]; then
+ SYSTEMD_ERROR=1
+ message "\n${PROBLEM_COLOR}WARNING: ${FILE_COLOR}/var/lock${MESSAGE_COLOR} is not a symlink."
+ if mountpoint -q /var/lock; then
+ message "${MESSAGE_COLOR}To manually create a symlink to /run/lock run 'umount /var/lock; rm -rf /var/lock; ln -s ../run/lock /var/lock'"
+ else
+ message "${MESSAGE_COLOR}To manually create a symlink to /run/lock run 'rm -rf /var/lock; ln -s ../run/lock /var/lock'"
+ fi
+fi
+
+if egrep -q '^(proc|none|devpts|usbfs|tmpfs)' /etc/fstab; then
+ SYSTEMD_ERROR=1
+ message "\n${PROBLEM_COLOR}WARNING: ${MESSAGE_COLOR}Incompatible systemd mountpoints found in ${FILE_COLOR}/etc/fstab${MESSAGE_COLOR}."
+ message "${MESSAGE_COLOR}Please comment out or remove all lines except your file system and swap mountpoints from ${FILE_COLOR}/etc/fstab${MESSAGE_COLOR}."
+ message "${MESSAGE_COLOR}Hint: Lines that begin with proc, none, devpts, usbfs and tmpfs can safely be removed."
+fi
+
+if [ -n "$SYSTEMD_ERROR" ]; then
+ message "\e[5;31mPress any key to continue..."
+ read -n 1
+fi
+
+lin -c dbus

0 comments on commit ef97271

Please sign in to comment.