summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorSimon Rettberg2013-03-19 19:41:43 +0100
committerSimon Rettberg2013-03-19 19:41:43 +0100
commitf0a83930511654544f8c821768722cd2f2592e1c (patch)
treee348e074f13bbc22519fb8607e35767af98845f2 /remote/modules
parentMerge branch 'master' of ssh://openslx/openslx-ng/tm-scripts (diff)
downloadtm-scripts-f0a83930511654544f8c821768722cd2f2592e1c.tar.gz
tm-scripts-f0a83930511654544f8c821768722cd2f2592e1c.tar.xz
tm-scripts-f0a83930511654544f8c821768722cd2f2592e1c.zip
Tweak modules to work with openSUSE 12.1
Diffstat (limited to 'remote/modules')
-rw-r--r--remote/modules/kdm/kdm.build9
-rw-r--r--remote/modules/kdm/kdm.conf10
-rw-r--r--remote/modules/kdm/kdm.conf.zypper14
-rw-r--r--remote/modules/plymouth/plymouth.conf.zypper14
-rw-r--r--remote/modules/policykit/policykit.conf2
-rw-r--r--remote/modules/policykit/policykit.conf.zypper11
-rw-r--r--remote/modules/systemd/systemd.conf.zypper81
-rw-r--r--remote/modules/xorg/xorg.build2
-rw-r--r--remote/modules/xorg/xorg.conf.zypper19
9 files changed, 152 insertions, 10 deletions
diff --git a/remote/modules/kdm/kdm.build b/remote/modules/kdm/kdm.build
index 3a924380..638f8088 100644
--- a/remote/modules/kdm/kdm.build
+++ b/remote/modules/kdm/kdm.build
@@ -20,14 +20,7 @@ post_copy() {
#copy required icons
- tarcopy "/usr/share/icons/oxygen/16x16/actions/system-reboot.png
- /usr/share/icons/oxygen/16x16/actions/system-shutdown.png
- /usr/share/icons/oxygen/16x16/actions/dialog-cancel.png
- /usr/share/icons/oxygen/index.theme
- /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" ${TARGET_BUILD_DIR}
+ [ ! -z "$REQUIRED_SYSTEM_FILES" ] && tarcopy "$REQUIRED_SYSTEM_FILES" "$TARGET_BUILD_DIR"
gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/oxygen/" || perror "update-icon-cache-3.0 failed."
}
diff --git a/remote/modules/kdm/kdm.conf b/remote/modules/kdm/kdm.conf
index 85f4ae66..75a84999 100644
--- a/remote/modules/kdm/kdm.conf
+++ b/remote/modules/kdm/kdm.conf
@@ -13,3 +13,13 @@ REQUIRED_DIRECTORIES=" /etc/dbus-1
/usr/bin"
REQUIRED_FILES=""
REQUIRED_LIBRARIES=""
+# non-standard vars
+REQUIRED_SYSTEM_FILES=" /usr/share/icons/oxygen/16x16/actions/system-reboot.png
+ /usr/share/icons/oxygen/16x16/actions/system-shutdown.png
+ /usr/share/icons/oxygen/16x16/actions/dialog-cancel.png
+ /usr/share/icons/oxygen/index.theme
+ /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/kdm.conf.zypper b/remote/modules/kdm/kdm.conf.zypper
new file mode 100644
index 00000000..b0516430
--- /dev/null
+++ b/remote/modules/kdm/kdm.conf.zypper
@@ -0,0 +1,14 @@
+REQUIRED_DEPENDENCIES="kdm"
+REQUIRED_PACKAGES="kdm kde-workspace-kgreet-plugins"
+REQUIRED_BINARIES=""
+REQUIRED_DIRECTORIES=" /etc/dbus-1
+ /usr/lib/kde4
+ /usr/share/dbus-1
+ /usr/share/polkit-1
+ /usr/share/kde4/services
+ /usr/bin"
+REQUIRED_FILES=""
+REQUIRED_LIBRARIES=""
+#non-standard vars
+REQUIRED_SYSTEM_FILES=""
+
diff --git a/remote/modules/plymouth/plymouth.conf.zypper b/remote/modules/plymouth/plymouth.conf.zypper
new file mode 100644
index 00000000..9166c137
--- /dev/null
+++ b/remote/modules/plymouth/plymouth.conf.zypper
@@ -0,0 +1,14 @@
+VERSION=plymouth-0.8.6.1
+URL=http://www.freedesktop.org/software/plymouth/releases/${VERSION}.tar.bz2
+REQUIRED_DEPENDENCIES=" libpng12-devel
+ pango-devel
+ cairo-devel
+ gtk2-devel
+ libdrm-devel"
+REQUIRED_BINARIES=" plymouth
+ plymouthd"
+REQUIRED_DIRECTORIES=" /bin
+ /etc
+ /lib
+ /sbin
+ /var"
diff --git a/remote/modules/policykit/policykit.conf b/remote/modules/policykit/policykit.conf
index 3dcfd8d9..cf04281d 100644
--- a/remote/modules/policykit/policykit.conf
+++ b/remote/modules/policykit/policykit.conf
@@ -6,6 +6,6 @@ REQUIRED_DIRECTORIES=" /etc/pam.d /etc/dbus-1 /etc/polkit-1
/usr/share/dbus-1
/usr/share/polkit-1
/usr/lib/policykit-1
- /usr/lib/${ARCH_TRIPLET}/polkit-1"
+ /usr${ARCH_LIB_DIR}/polkit-1"
REQUIRED_FILES=""
REQUIRED_LIBRARIES="libmozjs185"
diff --git a/remote/modules/policykit/policykit.conf.zypper b/remote/modules/policykit/policykit.conf.zypper
new file mode 100644
index 00000000..5d334b1e
--- /dev/null
+++ b/remote/modules/policykit/policykit.conf.zypper
@@ -0,0 +1,11 @@
+REQUIRED_DEPENDENCIES="libmozjs185-1_0"
+REQUIRED_PACKAGES="libmozjs185-1_0 polkit"
+REQUIRED_BINARIES=""
+REQUIRED_DIRECTORIES=" /etc/pam.d /etc/dbus-1 /etc/polkit-1
+ /usr/bin
+ /usr/share/dbus-1
+ /usr/share/polkit-1
+ /usr/lib/polkit-1
+ /usr${ARCH_LIB_DIR}/polkit-1"
+REQUIRED_FILES=""
+REQUIRED_LIBRARIES="libmozjs185"
diff --git a/remote/modules/systemd/systemd.conf.zypper b/remote/modules/systemd/systemd.conf.zypper
new file mode 100644
index 00000000..d76d008e
--- /dev/null
+++ b/remote/modules/systemd/systemd.conf.zypper
@@ -0,0 +1,81 @@
+VERSION=systemd-197
+URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
+REQUIRED_DEPENDENCIES=" intltool
+ gperf
+ pkg-config
+ libcap-devel
+ libudev-devel
+ dbus-1-devel"
+REQUIRED_BINARIES=" hostnamectl
+ journalctl
+ localectl
+ loginctl
+ systemctl
+ systemd-analyze
+ systemd-ask-password
+ systemd-cat
+ systemd-cgls
+ systemd-cgtop
+ systemd-coredumpctl
+ 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
+ timedatectl
+ udevadm
+ systemd
+ systemd-ac-power
+ systemd-binfmt
+ systemd-bootchart
+ systemd-cgroups-agent
+ systemd-coredump
+ systemd-fsck
+ systemd-hostnamed
+ systemd-initctl
+ systemd-journald
+ systemd-localed
+ systemd-logind
+ systemd-modules-load
+ systemd-multi-seat-x
+ systemd-quotacheck
+ systemd-random-seed
+ systemd-readahead
+ systemd-remount-fs
+ systemd-reply-password
+ systemd-shutdown
+ systemd-shutdownd
+ systemd-sleep
+ systemd-sysctl
+ systemd-timedated
+ systemd-timestamp
+ 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
+ keymap
+ mtd_probe
+ scsi_id
+ v4l_id"
+REQUIRED_DIRECTORIES=" /etc
+ /usr/lib
+ /usr/include
+ /usr/share/dbus-1
+ /usr/share/polkit-1
+ /usr/lib/udev/rules.d"
+REQUIRED_FILES=" /usr/bin/systemd-analyze
+ /usr/share/systemd/kbd-model-map
+ /usr/lib/udev/findkeyboards
+ /usr/lib/udev/keyboard-force-release.sh"
diff --git a/remote/modules/xorg/xorg.build b/remote/modules/xorg/xorg.build
index 4adcd214..8026f2b2 100644
--- a/remote/modules/xorg/xorg.build
+++ b/remote/modules/xorg/xorg.build
@@ -16,6 +16,6 @@ post_copy() {
mkdir -p "${TARGET_BUILD_DIR}/etc/X11"
[ ! -e ${TARGET_BUILD_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${TARGET_BUILD_DIR}/etc/X11/X
mkdir -p "${TARGET_BUILD_DIR}/var/lib/xkb"
- cp /var/lib/xkb/server* "${TARGET_BUILD_DIR}/var/lib/xkb/" || perror "Copying /var/lib/xkb/server* to '${TARGET_BUILD_DIR}/var/lib/xkb/' failed."
+ cp /var/lib/xkb/server* "${TARGET_BUILD_DIR}/var/lib/xkb/" #|| perror "Copying /var/lib/xkb/server* to '${TARGET_BUILD_DIR}/var/lib/xkb/' failed."
}
diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper
new file mode 100644
index 00000000..c5e21646
--- /dev/null
+++ b/remote/modules/xorg/xorg.conf.zypper
@@ -0,0 +1,19 @@
+REQUIRED_PACKAGES=" xorg-x11
+ xorg-x11-server
+ xorg-x11-driver-input"
+REQUIRED_BINARIES=" Xorg
+ gtf
+ cvt
+ X
+ xkbcomp
+ xkbvleds
+ xkbprint
+ setxkbmap
+ xkbwatch
+ xkbbell
+ xkbevd
+ vmmouse_detect"
+REQUIRED_DIRECTORIES=" /lib/udev
+ /usr/lib
+ /usr/share/X11"
+REQUIRED_FILES=""