From 462270ccd3da81447e53f936e82d8e1f0a9a5fd7 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 14 Apr 2014 14:54:42 +0200 Subject: lets try to make it work for Ubuntu 14.x before forcing subversion --- remote/modules/kdm/module.conf.ubuntu.14 | 29 +++++++++++++++++++++++++ remote/modules/kdm/module.conf.ubuntu.14.04 | 29 ------------------------- remote/modules/systemd/module.conf.ubuntu.14 | 14 ++++++++++++ remote/modules/systemd/module.conf.ubuntu.14.04 | 13 ----------- 4 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 remote/modules/kdm/module.conf.ubuntu.14 delete mode 100644 remote/modules/kdm/module.conf.ubuntu.14.04 create mode 100644 remote/modules/systemd/module.conf.ubuntu.14 delete mode 100644 remote/modules/systemd/module.conf.ubuntu.14.04 (limited to 'remote/modules') diff --git a/remote/modules/kdm/module.conf.ubuntu.14 b/remote/modules/kdm/module.conf.ubuntu.14 new file mode 100644 index 00000000..e29f35d0 --- /dev/null +++ b/remote/modules/kdm/module.conf.ubuntu.14 @@ -0,0 +1,29 @@ +REQUIRED_INSTALLED_PACKAGES=" + kdm + kde-workspace-kgreet-plugins +" +REQUIRED_CONTENT_PACKAGES=" + kdm + kde-workspace-kgreet-plugins + libicu52 + libxcursor1 + libxrandr2 + libxfixes3 + libxinerama1 + libxi6 +" +REQUIRED_DIRECTORIES+=" + /usr/lib + /etc/pam.d + /etc/logrotate.d + /etc/insserv.conf.d + /etc/kde4/kdm +" +# non-standard vars +REQUIRED_SYSTEM_FILES+=" + /usr/share/kde4/apps/kdm/pics/shutdown.png + /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf + /usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf + /usr/share/icons/default/index.theme +" + diff --git a/remote/modules/kdm/module.conf.ubuntu.14.04 b/remote/modules/kdm/module.conf.ubuntu.14.04 deleted file mode 100644 index e29f35d0..00000000 --- a/remote/modules/kdm/module.conf.ubuntu.14.04 +++ /dev/null @@ -1,29 +0,0 @@ -REQUIRED_INSTALLED_PACKAGES=" - kdm - kde-workspace-kgreet-plugins -" -REQUIRED_CONTENT_PACKAGES=" - kdm - kde-workspace-kgreet-plugins - libicu52 - libxcursor1 - libxrandr2 - libxfixes3 - libxinerama1 - libxi6 -" -REQUIRED_DIRECTORIES+=" - /usr/lib - /etc/pam.d - /etc/logrotate.d - /etc/insserv.conf.d - /etc/kde4/kdm -" -# non-standard vars -REQUIRED_SYSTEM_FILES+=" - /usr/share/kde4/apps/kdm/pics/shutdown.png - /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf - /usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf - /usr/share/icons/default/index.theme -" - diff --git a/remote/modules/systemd/module.conf.ubuntu.14 b/remote/modules/systemd/module.conf.ubuntu.14 new file mode 100644 index 00000000..ae603684 --- /dev/null +++ b/remote/modules/systemd/module.conf.ubuntu.14 @@ -0,0 +1,14 @@ +REQUIRED_INSTALLED_PACKAGES=" + intltool + gperf + dbus + pkg-config + libcap-dev + libudev-dev + libdbus-1-dev + xsltproc + libblkid-dev + libacl1-dev + libpam-dev +" +REQUIRED_SYS_ATTR_PATCH="yes" diff --git a/remote/modules/systemd/module.conf.ubuntu.14.04 b/remote/modules/systemd/module.conf.ubuntu.14.04 deleted file mode 100644 index 2768b51c..00000000 --- a/remote/modules/systemd/module.conf.ubuntu.14.04 +++ /dev/null @@ -1,13 +0,0 @@ -REQUIRED_INSTALLED_PACKAGES=" - intltool - gperf - dbus - pkg-config - libcap-dev - libudev-dev - libdbus-1-dev - xsltproc - libblkid-dev - libacl1-dev - libpam-dev -" -- cgit v1.2.3-55-g7522 From 213b6b01171b608ab2c3e57a75969063878b3f05 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 14 Apr 2014 15:08:29 +0200 Subject: [systemd] patch src/core/socket.c for ubuntu 14 --- remote/modules/systemd/module.build | 11 +++++++++++ remote/modules/systemd/module.conf.ubuntu.14 | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'remote/modules') diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build index 95576548..3b11c5ee 100644 --- a/remote/modules/systemd/module.build +++ b/remote/modules/systemd/module.build @@ -27,6 +27,17 @@ build () { cd "${MODULE_DIR}/src/$REQUIRED_VERSION" pinfo "calling configure" + # patch src/core/socket.c if activated in the config file + if [ "$REQUIRED_XATTR_PATCH" == "xyes" ]; then + # patch it + if [ -e "src/core/socket.c" ]; then + sed 's/^#include $/#include \n#include /g' src/core/socket.c \ + || perror "Could not patch '$(pwd)/src/core/socket.c'" + else + perror "'$(pwd)/src/core/socket.c' does not exist." + fi + fi + # Save potentially pre-used paths/flages OLDLDFLAGS="$LDFLAGS" OLDCPPFLAGS="$CPPFLAGS" diff --git a/remote/modules/systemd/module.conf.ubuntu.14 b/remote/modules/systemd/module.conf.ubuntu.14 index ae603684..d8e41bef 100644 --- a/remote/modules/systemd/module.conf.ubuntu.14 +++ b/remote/modules/systemd/module.conf.ubuntu.14 @@ -11,4 +11,4 @@ REQUIRED_INSTALLED_PACKAGES=" libacl1-dev libpam-dev " -REQUIRED_SYS_ATTR_PATCH="yes" +REQUIRED_XATTR_PATCH="yes" -- cgit v1.2.3-55-g7522 From aba579f071ad62681adac35e5e78bef1ad52002a Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 14 Apr 2014 15:12:08 +0200 Subject: [systemd] use systemd 212 (only for ubuntu 14 for now) --- remote/modules/systemd/module.conf.ubuntu.14 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'remote/modules') diff --git a/remote/modules/systemd/module.conf.ubuntu.14 b/remote/modules/systemd/module.conf.ubuntu.14 index d8e41bef..1724d26f 100644 --- a/remote/modules/systemd/module.conf.ubuntu.14 +++ b/remote/modules/systemd/module.conf.ubuntu.14 @@ -1,3 +1,5 @@ +REQUIRED_VERSION="systemd-212" +REQUIRED_LIBKMOD_VERSION="kmod-15" REQUIRED_INSTALLED_PACKAGES=" intltool gperf -- cgit v1.2.3-55-g7522 From 347bf1c5498a9a99974d994ee66eea8faa64d2b7 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Mon, 14 Apr 2014 15:20:40 +0200 Subject: [vmchooser-runvirt] Just a little typo. --- remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remote/modules') diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt index ec9f906e..c4ae4617 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -51,7 +51,7 @@ cleanexit () { sleep 1 # remove config dirs when exit if echo "${RMDIRS}" 2>/dev/null | grep -q "${xmlvirt}"; then - writelog "${xmlvirt} exited. Cleanning up... \c" + writelog "${xmlvirt} exited. Cleaning up... \c" rm -rf -- ${RMDIRS} >/dev/null 2>&1 writelog "done" fi -- cgit v1.2.3-55-g7522 From c3bfb168f398668c1890e671908523144218438f Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Mon, 14 Apr 2014 15:28:33 +0200 Subject: [systemd] git REQUIRED_URL and REQUIRED_KMOD_URL added to U14.04-conf REQUIRED_LIBKMOD_URL --- remote/modules/systemd/module.conf.ubuntu.14 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'remote/modules') diff --git a/remote/modules/systemd/module.conf.ubuntu.14 b/remote/modules/systemd/module.conf.ubuntu.14 index 1724d26f..af404a7f 100644 --- a/remote/modules/systemd/module.conf.ubuntu.14 +++ b/remote/modules/systemd/module.conf.ubuntu.14 @@ -1,5 +1,8 @@ REQUIRED_VERSION="systemd-212" -REQUIRED_LIBKMOD_VERSION="kmod-15" +REQUIRED_URL="http://www.freedesktop.org/software/systemd/${REQUIRED_VERSION}.tar.xz" +REQUIRED_LIBKMOD_VERSION="kmod-17" +REQUIRED_LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${REQUIRED_LIBKMOD_VERSION}.tar.xz" + REQUIRED_INSTALLED_PACKAGES=" intltool gperf -- cgit v1.2.3-55-g7522 From 0d31c1cfaa3572af0166a43d9147416d857588e6 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 14 Apr 2014 15:32:22 +0200 Subject: [systemd] apply openslx patch only in systemd<212 for systemd 212 we use an alternative way using the option "set-environment" of systemctl. Corresponding services are in the static data folder --- remote/modules/systemd/module.build | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'remote/modules') diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build index 3b11c5ee..86ad7388 100644 --- a/remote/modules/systemd/module.build +++ b/remote/modules/systemd/module.build @@ -3,11 +3,27 @@ fetch_source () { # systemd download_untar "$REQUIRED_URL" "src/" - # Patch PATH, HOME, USER environment - # TODO: Newer systemd versions support DefaultEnvironment=xxx in /etc/systemd/system.conf - # However, there were lots of changes after systemd 204, so we didn't update yet - # See http://cgit.freedesktop.org/systemd/systemd/tree/NEWS for changes. - patch -p0 src/systemd-*/src/core/main.c < systemd-openslx.patch || perror "Failed to apply openslx systemd patch." + + # starting with systemd 212 a new way of setting global environment is supported + # meaning we don't have to apply the patch needed til that version. + if [ "x${REQUIRED_VERSION#systemd-}" = "x212" ]; then + # patch src/core/socket.c if activated in the config file + if [ "$REQUIRED_XATTR_PATCH" = "xyes" ]; then + # patch it + if [ -e "src/core/socket.c" ]; then + sed 's/^#include $/#include \n#include /g' src/core/socket.c \ + || perror "Could not patch '$(pwd)/src/core/socket.c'" + else + perror "'$(pwd)/src/core/socket.c' does not exist." + fi + fi + else + # Patch PATH, HOME, USER environment + # TODO: Newer systemd versions support DefaultEnvironment=xxx in /etc/systemd/system.conf + # However, there were lots of changes after systemd 204, so we didn't update yet + # See http://cgit.freedesktop.org/systemd/systemd/tree/NEWS for changes. + patch -p0 src/systemd-*/src/core/main.c < systemd-openslx.patch || perror "Failed to apply openslx systemd patch." + fi # libkmod download_untar "$REQUIRED_LIBKMOD_URL" "src/" @@ -27,17 +43,6 @@ build () { cd "${MODULE_DIR}/src/$REQUIRED_VERSION" pinfo "calling configure" - # patch src/core/socket.c if activated in the config file - if [ "$REQUIRED_XATTR_PATCH" == "xyes" ]; then - # patch it - if [ -e "src/core/socket.c" ]; then - sed 's/^#include $/#include \n#include /g' src/core/socket.c \ - || perror "Could not patch '$(pwd)/src/core/socket.c'" - else - perror "'$(pwd)/src/core/socket.c' does not exist." - fi - fi - # Save potentially pre-used paths/flages OLDLDFLAGS="$LDFLAGS" OLDCPPFLAGS="$CPPFLAGS" -- cgit v1.2.3-55-g7522 From 89e6665daafb7fe796d59fbc262d07334ced59a7 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 14 Apr 2014 15:41:41 +0200 Subject: [systemd] forgot '-i' for sed --- remote/modules/systemd/module.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remote/modules') diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build index 86ad7388..70ddfcc5 100644 --- a/remote/modules/systemd/module.build +++ b/remote/modules/systemd/module.build @@ -11,7 +11,7 @@ fetch_source () { if [ "$REQUIRED_XATTR_PATCH" = "xyes" ]; then # patch it if [ -e "src/core/socket.c" ]; then - sed 's/^#include $/#include \n#include /g' src/core/socket.c \ + sed -i 's/^#include $/#include \n#include /g' src/core/socket.c \ || perror "Could not patch '$(pwd)/src/core/socket.c'" else perror "'$(pwd)/src/core/socket.c' does not exist." -- cgit v1.2.3-55-g7522 From 6d8ae90844e2c82226e895fc767078f2beeaefd1 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 14 Apr 2014 16:11:26 +0200 Subject: [systemd] fixes for the patch apply logic... --- remote/modules/systemd/module.build | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'remote/modules') diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build index 70ddfcc5..2c27231e 100644 --- a/remote/modules/systemd/module.build +++ b/remote/modules/systemd/module.build @@ -7,14 +7,17 @@ fetch_source () { # starting with systemd 212 a new way of setting global environment is supported # meaning we don't have to apply the patch needed til that version. if [ "x${REQUIRED_VERSION#systemd-}" = "x212" ]; then + pinfo "Systemd version 212 detected." + pinfo "REQUIRED_XATTR_PATCH is $REQUIRED_XATTR_PATCH" # patch src/core/socket.c if activated in the config file - if [ "$REQUIRED_XATTR_PATCH" = "xyes" ]; then + if [ "x$REQUIRED_XATTR_PATCH" = "xyes" ]; then + pinfo "Patching 'src/core/socket.c' ..." # patch it - if [ -e "src/core/socket.c" ]; then - sed -i 's/^#include $/#include \n#include /g' src/core/socket.c \ - || perror "Could not patch '$(pwd)/src/core/socket.c'" + if [ -e "src/$REQUIRED_VERSION/src/core/socket.c" ]; then + sed -i 's/^#include $/#include \n#include /g' "src/$REQUIRED_VERSION/src/core/socket.c" \ + || perror "Could not patch 'src/$REQUIRED_VERSION/src/core/socket.c'" else - perror "'$(pwd)/src/core/socket.c' does not exist." + perror "'src/$REQUIRED_VERSION//src/core/socket.c' does not exist." fi fi else -- cgit v1.2.3-55-g7522 From 1cf2ad00a4c3cc9537fa0939e93725f4be62e824 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 14 Apr 2014 16:20:54 +0200 Subject: [systemd] remove 'systemd-timestamp' from binary list --- remote/modules/systemd/module.conf.ubuntu.14 | 53 ++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'remote/modules') diff --git a/remote/modules/systemd/module.conf.ubuntu.14 b/remote/modules/systemd/module.conf.ubuntu.14 index af404a7f..f5ed3c0f 100644 --- a/remote/modules/systemd/module.conf.ubuntu.14 +++ b/remote/modules/systemd/module.conf.ubuntu.14 @@ -16,4 +16,57 @@ REQUIRED_INSTALLED_PACKAGES=" libacl1-dev libpam-dev " +REQUIRED_BINARIES=" + journalctl + loginctl + systemctl + systemd-analyze + systemd-ask-password + systemd-cat + systemd-cgls + systemd-cgtop + systemd-delta + systemd-detect-virt + systemd-inhibit + systemd-machine-id-setup + systemd-notify + systemd-nspawn + systemd-stdio-bridge + systemd-tmpfiles + systemd-tty-ask-password-agent + udevadm + systemd + systemd-ac-power + systemd-binfmt + systemd-cgroups-agent + systemd-fsck + systemd-initctl + systemd-journald + systemd-logind + systemd-modules-load + systemd-multi-seat-x + systemd-random-seed + systemd-readahead + systemd-remount-fs + systemd-reply-password + systemd-shutdown + systemd-shutdownd + systemd-sleep + systemd-sysctl + systemd-udevd + systemd-update-utmp + systemd-user-sessions + systemd-vconsole-setup + systemd-fstab-generator + systemd-getty-generator + systemd-rc-local-generator + systemd-system-update-generator + accelerometer + ata_id + cdrom_id + collect + mtd_probe + scsi_id + v4l_id +" REQUIRED_XATTR_PATCH="yes" -- cgit v1.2.3-55-g7522