diff options
Diffstat (limited to 'remote/modules')
21 files changed, 63 insertions, 151 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/dbus/dbus.conf b/remote/modules/dbus/dbus.conf index a8c97d9c..4a1bc6a5 100644 --- a/remote/modules/dbus/dbus.conf +++ b/remote/modules/dbus/dbus.conf @@ -5,5 +5,6 @@ REQUIRED_BINARIES=" dbus-cleanup-sockets dbus-monitor dbus-send dbus-daemon-launch-helper" -REQUIRED_DIRECTORIES=" /etc/dbus-1" +REQUIRED_DIRECTORIES=" /etc/dbus-1 + /lib/systemd" REQUIRED_FILES=" /etc/default/dbus" diff --git a/remote/modules/dbus/dbus.conf.zypper b/remote/modules/dbus/dbus.conf.zypper index db7183c5..e34e47d8 100644 --- a/remote/modules/dbus/dbus.conf.zypper +++ b/remote/modules/dbus/dbus.conf.zypper @@ -5,5 +5,6 @@ REQUIRED_BINARIES=" dbus-cleanup-sockets dbus-monitor dbus-send dbus-daemon-launch-helper" -REQUIRED_DIRECTORIES=" /etc/dbus-1" +REQUIRED_DIRECTORIES=" /etc/dbus-1 + /usr/lib/systemd" REQUIRED_FILES="" diff --git a/remote/modules/kdm/kdm.conf.zypper b/remote/modules/kdm/kdm.conf.zypper index 51e73fbf..23034356 100644 --- a/remote/modules/kdm/kdm.conf.zypper +++ b/remote/modules/kdm/kdm.conf.zypper @@ -10,5 +10,9 @@ REQUIRED_DIRECTORIES=" /etc/dbus-1 REQUIRED_FILES="" REQUIRED_LIBRARIES="" #non-standard vars -REQUIRED_SYSTEM_FILES="" +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/icons/default.kde4/index.theme" diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper index 1562ec7f..311b7f6c 100644 --- a/remote/modules/pam/pam.conf.zypper +++ b/remote/modules/pam/pam.conf.zypper @@ -1,11 +1,9 @@ -REQUIRED_DEPENDENCIES=" pam_ldap pam pam-devel nss_ldap" -REQUIRED_PACKAGES=" pam_ldap pam pam-devel nss_ldap" +REQUIRED_DEPENDENCIES=" pam_ldap pam pam-devel nss_ldap nss-pam-ldapd pam-modules" +REQUIRED_PACKAGES=" pam_ldap pam pam-devel nss_ldap nss-pam-ldapd pam-modules" 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/plymouth/data/etc/systemd/system/plymouth-halt.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-halt.service deleted file mode 100644 index d01ba9b8..00000000 --- a/remote/modules/plymouth/data/etc/systemd/system/plymouth-halt.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Show Plymouth Halt Screen -After=getty@tty1.service prefdm.service plymouth-start.service -Before=halt.service -DefaultDependencies=no -ConditionKernelCommandLine=!plymouth.enable=0 - -[Service] -ExecStart=/sbin/plymouthd --mode=shutdown --attach-to-session -ExecStartPost=-/bin/plymouth show-splash -Type=forking diff --git a/remote/modules/plymouth/data/etc/systemd/system/plymouth-kexec.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-kexec.service deleted file mode 100644 index 1fe6e47f..00000000 --- a/remote/modules/plymouth/data/etc/systemd/system/plymouth-kexec.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Show Plymouth Reboot with kexec Screen -After=getty@tty1.service prefdm.service plymouth-start.service -Before=kexec.service -DefaultDependencies=no -ConditionKernelCommandLine=!plymouth.enable=0 - -[Service] -ExecStart=/sbin/plymouthd --mode=shutdown --attach-to-session -ExecStartPost=-/bin/plymouth show-splash -Type=forking diff --git a/remote/modules/plymouth/data/etc/systemd/system/plymouth-poweroff.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-poweroff.service deleted file mode 100644 index 49742f6e..00000000 --- a/remote/modules/plymouth/data/etc/systemd/system/plymouth-poweroff.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Show Plymouth Power Off Screen -After=getty@tty1.service prefdm.service plymouth-start.service -Before=poweroff.service -DefaultDependencies=no -ConditionKernelCommandLine=!plymouth.enable=0 - -[Service] -ExecStart=/sbin/plymouthd --mode=shutdown --attach-to-session -ExecStartPost=-/bin/plymouth show-splash -Type=forking diff --git a/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit-wait.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit-wait.service deleted file mode 100644 index 56af45a7..00000000 --- a/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit-wait.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Wait for Plymouth Boot Screen to Quit -After=rc-local.service plymouth-start.service systemd-user-sessions.service - -[Service] -ExecStart=-/bin/plymouth --wait -Type=oneshot -TimeoutSec=20 diff --git a/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit.service deleted file mode 100644 index be3c1888..00000000 --- a/remote/modules/plymouth/data/etc/systemd/system/plymouth-quit.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Terminate Plymouth Boot Screen -After=rc-local.service plymouth-start.service systemd-user-sessions.service - -[Service] -ExecStart=-/bin/plymouth quit -Type=oneshot -TimeoutSec=20 diff --git a/remote/modules/plymouth/data/etc/systemd/system/plymouth-read-write.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-read-write.service deleted file mode 100644 index caa3973b..00000000 --- a/remote/modules/plymouth/data/etc/systemd/system/plymouth-read-write.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Tell Plymouth To Write Out Runtime Data -DefaultDependencies=no -After=local-fs.target -Before=sysinit.target - -[Service] -ExecStart=-/bin/plymouth update-root-fs --read-write -Type=oneshot diff --git a/remote/modules/plymouth/data/etc/systemd/system/plymouth-reboot.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-reboot.service deleted file mode 100644 index dbedd00d..00000000 --- a/remote/modules/plymouth/data/etc/systemd/system/plymouth-reboot.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Show Plymouth Reboot Screen -After=getty@tty1.service prefdm.service plymouth-start.service -Before=reboot.service -DefaultDependencies=no -ConditionKernelCommandLine=!plymouth.enable=0 - -[Service] -ExecStart=/sbin/plymouthd --mode=shutdown --attach-to-session -ExecStartPost=-/bin/plymouth show-splash -Type=forking diff --git a/remote/modules/plymouth/data/etc/systemd/system/plymouth-start.service b/remote/modules/plymouth/data/etc/systemd/system/plymouth-start.service deleted file mode 100644 index 09243001..00000000 --- a/remote/modules/plymouth/data/etc/systemd/system/plymouth-start.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Show Plymouth Boot Screen -DefaultDependencies=no -Wants=systemd-ask-password-plymouth.path -After=systemd-vconsole-setup.service systemd-udev-settle.service -Before=systemd-ask-password-plymouth.service -ConditionKernelCommandLine=!plymouth.enable=0 -ConditionPathExists=!/run/plymouth/pid - -[Service] -ExecStart=/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session -ExecStartPost=-/bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev;-/bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev; -/bin/plymouth show-splash -Type=forking diff --git a/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.path b/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.path deleted file mode 100644 index c2ee4206..00000000 --- a/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.path +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Forward Password Requests to Plymouth Directory Watch -Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents -DefaultDependencies=no -Conflicts=shutdown.target -After=plymouth-start.service -Before=basic.target shutdown.target -ConditionKernelCommandLine=!plymouth.enable=0 -ConditionPathExists=/run/plymouth/pid - -[Path] -DirectoryNotEmpty=/run/systemd/ask-password -MakeDirectory=yes diff --git a/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.service b/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.service deleted file mode 100644 index aa9ffc21..00000000 --- a/remote/modules/plymouth/data/etc/systemd/system/systemd-ask-password-plymouth.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Forward Password Requests to Plymouth -Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents -DefaultDependencies=no -Conflicts=shutdown.target -After=plymouth-start.service -Before=shutdown.target -ConditionKernelCommandLine=!plymouth.enable=0 -ConditionPathExists=/run/plymouth/pid - -[Service] -ExecStart=/bin/systemd-tty-ask-password-agent --watch --plymouth diff --git a/remote/modules/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/rsyslogd.build index 43aa112d..cee5c7ed 100644 --- a/remote/modules/rsyslogd/rsyslogd.build +++ b/remote/modules/rsyslogd/rsyslogd.build @@ -3,30 +3,22 @@ fetch_source() { } build() { + COPYLIST="list_dpkg_output" + [ -e "$COPYLIST" ] && rm "$COPYLIST" - FILELIST="list_binaries_and_files" - BIN_LOCATION=$(which rsyslogd) - if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ]; - then - get_link_chain "${BIN_LOCATION}" >> "${FILELIST}" - else - perror "${BIN} not found on the system! Please install it." - exit 1 - fi - - for ENTRY in ${REQUIRED_FILES} ${REQUIRED_DIRECTORIES}; do - get_link_chain "${ENTRY}" >> "${FILELIST}" - done - - tarcopy "$(cat ${FILELIST}|sort -u)" "${MODULE_BUILD_DIR}" + list_packet_files >> "$COPYLIST" + tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" + return 0 } -post_copy() { +post_copy() { + # pwd = module's build dir mkdir -p "${TARGET_BUILD_DIR}"/var/spool/rsyslog - - [ -e /lib/systemd/system/rsyslog.service ] \ - && cp /lib/systemd/system/rsyslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/ + + local RSL="$(find /usr/lib/ /lib/ -name rsyslog.service | head -1)" + [ -z "$RSL" -o ! -e "$RSL" ] && perror "rsyslog.service not found on vorlage" + cp -L "$RSL" "$TARGET_BUILD_DIR/etc/systemd/system/" sed -i 's/\/bin\/systemctl/-\/usr\/bin\/systemctl/g' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service sed -i 's/^Before=udev/#&/' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service diff --git a/remote/modules/rsyslogd/rsyslogd.conf.zypper b/remote/modules/rsyslogd/rsyslogd.conf.zypper index c41d7922..a70940e8 100644 --- a/remote/modules/rsyslogd/rsyslogd.conf.zypper +++ b/remote/modules/rsyslogd/rsyslogd.conf.zypper @@ -1,2 +1,6 @@ +REQUIRED_BINARIES=" rsyslogd + rsyslog-service-prepare" +REQUIRED_PACKAGES=" rsyslog" REQUIRED_DIRECTORIES=" /etc/rsyslog.d - /lib/rsyslog" + /usr/lib/rsyslog + /var/run" 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..22a6bdd8 100644 --- a/remote/modules/xorg/xorg.conf.zypper +++ b/remote/modules/xorg/xorg.conf.zypper @@ -3,15 +3,31 @@ REQUIRED_PACKAGES=" xorg-x11 xorg-x11-driver-input xorg-x11-driver-video xorg-x11-driver-video-nouveau - xorg-x11-driver-video-radeonhd + xf86-video-vmware + xf86-video-ati + xf86-video-nv + xf86-video-intel + xf86-video-i128 + xf86-video-geode + xf86-video-vesa + xf86-video-fbdev + xf86-video-modesetting + xf86-input-vmmouse + xf86-input-wacom + xf86-input-evdev + xf86-input-joystick + xf86-input-keyboard + xf86-input-mouse + xf86-input-synaptics + xf86-input-void xkeyboard-config - dejavu + xkbcomp + dejavu-fonts kdm-branding-openSUSE" REQUIRED_BINARIES=" Xorg gtf cvt X - xkbcomp xkbvleds xkbprint setxkbmap @@ -19,8 +35,8 @@ REQUIRED_BINARIES=" Xorg xkbbell xkbevd vmmouse_detect" -REQUIRED_DIRECTORIES=" /lib/udev - /usr/lib +REQUIRED_DIRECTORIES=" /usr/lib + /usr/bin /usr/share/X11 /usr/share/fonts" REQUIRED_FILES="/var/adm/fillup-templates/sysconfig.displaymanager-kdm" |