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 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(-) 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(+) 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