summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorSimon Rettberg2013-04-19 20:02:55 +0200
committerSimon Rettberg2013-04-19 20:02:55 +0200
commit0d4574eb1992a3963e77a5bd615cac864dab6c9f (patch)
treefb26625f060ec310400e73eeaedc69acd75daba2 /remote/modules
parentlist of wanted config options to compile our kernel with (diff)
downloadtm-scripts-0d4574eb1992a3963e77a5bd615cac864dab6c9f.tar.gz
tm-scripts-0d4574eb1992a3963e77a5bd615cac864dab6c9f.tar.xz
tm-scripts-0d4574eb1992a3963e77a5bd615cac864dab6c9f.zip
Update for openSUSE 12.3
Diffstat (limited to 'remote/modules')
-rw-r--r--remote/modules/dbus/dbus.build7
-rw-r--r--remote/modules/pam/pam.conf.zypper10
-rw-r--r--remote/modules/rsyslogd/rsyslogd.conf.zypper2
-rw-r--r--remote/modules/systemd/systemd.build6
-rw-r--r--remote/modules/systemd/systemd.conf.zypper5
-rw-r--r--remote/modules/xorg/xorg.build1
-rw-r--r--remote/modules/xorg/xorg.conf.zypper9
7 files changed, 20 insertions, 20 deletions
diff --git a/remote/modules/dbus/dbus.build b/remote/modules/dbus/dbus.build
index 31c75fc9..7f6d663f 100644
--- a/remote/modules/dbus/dbus.build
+++ b/remote/modules/dbus/dbus.build
@@ -16,7 +16,8 @@ post_copy() {
# quick fix to get the unit files from the package
# moved them from lib/systemd to usr/lib/systemd
- cd "${BUILDDIR}"
- tarcopy lib/systemd "${TARGET_BUILD_DIR}"/usr
- cd - &> /dev/null
+ #cd "${BUILDDIR}"
+ #tarcopy lib/systemd "${TARGET_BUILD_DIR}"/usr
+ #cd - &> /dev/null
+ :
}
diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper
index 1562ec7f..7c1dc5d6 100644
--- a/remote/modules/pam/pam.conf.zypper
+++ b/remote/modules/pam/pam.conf.zypper
@@ -3,9 +3,7 @@ REQUIRED_PACKAGES=" pam_ldap pam pam-devel nss_ldap"
REQUIRED_DIRECTORIES=" /lib
/usr/lib
/etc/security"
-REQUIRED_SYSTEM_FILES=" /etc/pam.conf
- /etc/login.defs
- /etc/nsswitch.conf
- /etc/securetty
- /etc/default/locale
- /lib/security"
+REQUIRED_SYSTEM_FILES=" /etc/login.defs
+ /etc/securetty
+ /lib/security"
+
diff --git a/remote/modules/rsyslogd/rsyslogd.conf.zypper b/remote/modules/rsyslogd/rsyslogd.conf.zypper
index c41d7922..e826768a 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf.zypper
+++ b/remote/modules/rsyslogd/rsyslogd.conf.zypper
@@ -1,2 +1,2 @@
REQUIRED_DIRECTORIES=" /etc/rsyslog.d
- /lib/rsyslog"
+ /usr/lib/rsyslog"
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index ee74d53a..fb56f231 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -8,9 +8,9 @@ fetch_source () {
build () {
#build libkmod
cd "${MODULE_DIR}/src/$LIBKMOD_VERSION"
- ./configure
- make || perror "make failed."
- make install || perror "make install failed."
+ ./configure || perror "./configure kmod failed."
+ make || perror "kmod make failed."
+ make install || perror "kmod make install failed."
cd - &> /dev/null
#build systemd
diff --git a/remote/modules/systemd/systemd.conf.zypper b/remote/modules/systemd/systemd.conf.zypper
index d76d008e..8fd38a30 100644
--- a/remote/modules/systemd/systemd.conf.zypper
+++ b/remote/modules/systemd/systemd.conf.zypper
@@ -1,11 +1,12 @@
-VERSION=systemd-197
+VERSION=systemd-201
URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
REQUIRED_DEPENDENCIES=" intltool
gperf
pkg-config
libcap-devel
libudev-devel
- dbus-1-devel"
+ dbus-1-devel
+ libxslt-tools"
REQUIRED_BINARIES=" hostnamectl
journalctl
localectl
diff --git a/remote/modules/xorg/xorg.build b/remote/modules/xorg/xorg.build
index 34750ef5..5b1b0847 100644
--- a/remote/modules/xorg/xorg.build
+++ b/remote/modules/xorg/xorg.build
@@ -10,6 +10,7 @@ build() {
list_packet_files >> "$COPYLIST"
tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+ pdebug ....
}
post_copy() {
diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper
index 8d02136c..d9259257 100644
--- a/remote/modules/xorg/xorg.conf.zypper
+++ b/remote/modules/xorg/xorg.conf.zypper
@@ -3,15 +3,15 @@ REQUIRED_PACKAGES=" xorg-x11
xorg-x11-driver-input
xorg-x11-driver-video
xorg-x11-driver-video-nouveau
- xorg-x11-driver-video-radeonhd
+ xf86-input-vmmouse
+ xf86-input-wacom
xkeyboard-config
- dejavu
+ dejavu-fonts
kdm-branding-openSUSE"
REQUIRED_BINARIES=" Xorg
gtf
cvt
X
- xkbcomp
xkbvleds
xkbprint
setxkbmap
@@ -19,8 +19,7 @@ REQUIRED_BINARIES=" Xorg
xkbbell
xkbevd
vmmouse_detect"
-REQUIRED_DIRECTORIES=" /lib/udev
- /usr/lib
+REQUIRED_DIRECTORIES=" /usr/lib
/usr/share/X11
/usr/share/fonts"
REQUIRED_FILES="/var/adm/fillup-templates/sysconfig.displaymanager-kdm"