From 9c547a5e5b50813f9441a96f3f8a7bd62d90f0e9 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 17 Jul 2014 15:11:20 +0200 Subject: [pam] reworked how we determine path to PAM-modules detect the path in remote/helper/paths.inc and use that global path in the build scripts --- remote/modules/systemd/module.build | 32 +++++++++++++++++++++----------- remote/modules/systemd/module.conf | 1 + 2 files changed, 22 insertions(+), 11 deletions(-) (limited to 'remote/modules/systemd') diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build index 4851f682..6e1cf4c1 100644 --- a/remote/modules/systemd/module.build +++ b/remote/modules/systemd/module.build @@ -59,11 +59,28 @@ build () { export PKG_CONFIG_PATH="${MODULE_BUILD_DIR}/usr/lib64/pkgconfig:${MODULE_BUILD_DIR}/usr/lib/pkgconfig" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${MODULE_BUILD_DIR}/usr/lib:${MODULE_BUILD_DIR}/usr/lib64" - ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls \ - --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated \ - --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam \ - --enable-kmod \ + ./configure \ + --disable-manpages \ + --enable-split-usr \ + --sysconfdir="/etc" \ + --enable-gtk-doc-html=no \ + --disable-nls \ + --disable-microhttpd \ + --disable-bootchart \ + --disable-quotacheck \ + --disable-hostnamed \ + --disable-timedated \ + --disable-localed \ + --disable-coredump \ + --disable-keymap \ + --without-python \ + --enable-blkid \ + --enable-acl \ + --enable-pam \ + --enable-kmod \ + --with-pamlibdir="$SYS_PAM_MODULES_PATH" \ || perror "configure failed." + pinfo "calling make" make || perror "make failed." pinfo "calling make install" @@ -82,12 +99,5 @@ post_copy() { if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ]; then sed -i "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service" fi - - # add pam_systemd.so to pam modules directory - if [ -e "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" ]; then - cp "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" "${TARGET_BUILD_DIR}/lib/security/" - else - pdebug "No such file: ${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" - fi } diff --git a/remote/modules/systemd/module.conf b/remote/modules/systemd/module.conf index 4ca11365..1bc0165e 100644 --- a/remote/modules/systemd/module.conf +++ b/remote/modules/systemd/module.conf @@ -56,6 +56,7 @@ REQUIRED_BINARIES=" scsi_id v4l_id" REQUIRED_DIRECTORIES=" + $SYS_PAM_MODULES_PATH /etc /usr/include /usr/share/dbus-1 -- cgit v1.2.3-55-g7522 From e57c4f6109c698431a6bd1fa39e3e293570f6cd4 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 17 Jul 2014 15:27:13 +0200 Subject: new 'stage32-headless' target. Started centos support. WIP Use stage32-headless to build on CentOS. Stage32-bwlp won't work yet. --- remote/includes/distribution.inc | 2 +- remote/includes/system.inc | 6 +-- remote/modules/dbus/module.conf.centos | 4 ++ remote/modules/idleaction/module.conf.centos | 6 +++ remote/modules/kernel/module.conf.centos | 3 ++ remote/modules/nscd/module.conf.centos | 6 +++ remote/modules/pam/module.conf.centos | 36 +++++++++++++ remote/modules/rsyslogd/module.conf.centos | 3 ++ remote/modules/smartctl/module.conf.centos | 6 +++ remote/modules/systemd/module.conf.centos | 11 ++++ remote/modules/xorg/module.conf.centos | 67 +++++++++++++++++++++++++ remote/rootfs/rootfs-stage32/module.conf.centos | 17 +++++++ remote/targets/stage32-headless/cron | 1 + remote/targets/stage32-headless/dbus | 1 + remote/targets/stage32-headless/dhcpc-busybox | 1 + remote/targets/stage32-headless/dnbd3 | 1 + remote/targets/stage32-headless/german | 1 + remote/targets/stage32-headless/idleaction | 1 + remote/targets/stage32-headless/kernel | 1 + remote/targets/stage32-headless/nscd | 1 + remote/targets/stage32-headless/pam | 1 + remote/targets/stage32-headless/rootfs-stage32 | 1 + remote/targets/stage32-headless/rsyslogd | 1 + remote/targets/stage32-headless/smartctl | 1 + remote/targets/stage32-headless/sshd | 1 + remote/targets/stage32-headless/systemd | 1 + remote/targets/stage32-headless/xorg | 1 + 27 files changed, 178 insertions(+), 4 deletions(-) create mode 100644 remote/modules/dbus/module.conf.centos create mode 100644 remote/modules/idleaction/module.conf.centos create mode 100644 remote/modules/kernel/module.conf.centos create mode 100644 remote/modules/nscd/module.conf.centos create mode 100644 remote/modules/pam/module.conf.centos create mode 100644 remote/modules/rsyslogd/module.conf.centos create mode 100644 remote/modules/smartctl/module.conf.centos create mode 100644 remote/modules/systemd/module.conf.centos create mode 100644 remote/modules/xorg/module.conf.centos create mode 100644 remote/rootfs/rootfs-stage32/module.conf.centos create mode 120000 remote/targets/stage32-headless/cron create mode 120000 remote/targets/stage32-headless/dbus create mode 120000 remote/targets/stage32-headless/dhcpc-busybox create mode 120000 remote/targets/stage32-headless/dnbd3 create mode 120000 remote/targets/stage32-headless/german create mode 120000 remote/targets/stage32-headless/idleaction create mode 120000 remote/targets/stage32-headless/kernel create mode 120000 remote/targets/stage32-headless/nscd create mode 120000 remote/targets/stage32-headless/pam create mode 120000 remote/targets/stage32-headless/rootfs-stage32 create mode 120000 remote/targets/stage32-headless/rsyslogd create mode 120000 remote/targets/stage32-headless/smartctl create mode 120000 remote/targets/stage32-headless/sshd create mode 120000 remote/targets/stage32-headless/systemd create mode 120000 remote/targets/stage32-headless/xorg (limited to 'remote/modules/systemd') diff --git a/remote/includes/distribution.inc b/remote/includes/distribution.inc index 137da7ef..485d1224 100644 --- a/remote/includes/distribution.inc +++ b/remote/includes/distribution.inc @@ -18,7 +18,7 @@ detect_distribution () { PACKET_MANAGER="zypper" PACKET_HANDLER="rpm" ;; - scientific|fedora) + centos|scientific|fedora) PACKET_MANAGER="yum" PACKET_HANDLER="rpm" ;; diff --git a/remote/includes/system.inc b/remote/includes/system.inc index 17a80761..03c455e4 100644 --- a/remote/includes/system.inc +++ b/remote/includes/system.inc @@ -19,9 +19,8 @@ export MAKEFLAGS="-j$CPU_CORES" if [ "$(uname -m)x" = "x86_64x" ]; then # Setting LIB64, as openSuse differentiates but Ubuntu does not: case $SYS_DISTRIBUTION in - ubuntu | debian) LIB64="lib" ;; - opensuse) LIB64="lib64" ;; - fedora) LIB64="lib64" ;; + ubuntu | debian) LIB64="lib" ;; + opensuse | fedora | centos) LIB64="lib64" ;; *) perror "Cannot set LIB64, SYS_DISTRIBUTION: $SYS_DISTRIBUTION unknown!" ;; esac AMD64_I386=amd64 @@ -36,3 +35,4 @@ else ARCHREGEX="(i[3456]86|x86[_-]32)" fi +pinfo "LIB64 is: $LIB64" diff --git a/remote/modules/dbus/module.conf.centos b/remote/modules/dbus/module.conf.centos new file mode 100644 index 00000000..f38f590f --- /dev/null +++ b/remote/modules/dbus/module.conf.centos @@ -0,0 +1,4 @@ +REQUIRED_CONTENT_PACKAGES=" + dbus +" + diff --git a/remote/modules/idleaction/module.conf.centos b/remote/modules/idleaction/module.conf.centos new file mode 100644 index 00000000..d368cbd8 --- /dev/null +++ b/remote/modules/idleaction/module.conf.centos @@ -0,0 +1,6 @@ +REQUIRED_INSTALLED_PACKAGES=" + libX11-devel + libXScrnSaver-devel + xorg-x11-proto-devel +" + diff --git a/remote/modules/kernel/module.conf.centos b/remote/modules/kernel/module.conf.centos new file mode 100644 index 00000000..2e958ce4 --- /dev/null +++ b/remote/modules/kernel/module.conf.centos @@ -0,0 +1,3 @@ +REQUIRED_GIT_BRANCH="v${SYSTEM_KERNEL_SHORT%.0}" +REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git" + diff --git a/remote/modules/nscd/module.conf.centos b/remote/modules/nscd/module.conf.centos new file mode 100644 index 00000000..4a61cc19 --- /dev/null +++ b/remote/modules/nscd/module.conf.centos @@ -0,0 +1,6 @@ +REQUIRED_INSTALLED_PACKAGES=" + nscd +" +REQUIRED_CONTENT_PACKAGES=" + nscd +" diff --git a/remote/modules/pam/module.conf.centos b/remote/modules/pam/module.conf.centos new file mode 100644 index 00000000..5dadea53 --- /dev/null +++ b/remote/modules/pam/module.conf.centos @@ -0,0 +1,36 @@ +# erase generic conf settings +REQUIRED_BINARIES="" +REQUIRED_FILES="" +REQUIRED_INSTALLED_PACKAGES=" + pam + pam-devel + pam_krb5 + libnfsidmap + nss-mdns + openssl-devel + nfs-utils + glibc +" +REQUIRED_CONTENT_PACKAGES=" + pam + pam-devel + pam_krb5 + libnfsidmap + nss-mdns + nfs-utils + glibc +" +REQUIRED_LIBRARIES+=" + libnss_compat + libnss_db + libnss_dns + libnss_files + libnss_nis +" +REQUIRED_DIRECTORIES+=" + /$LIB64 +" +REQUIRED_SYSTEM_FILES+=" + $SYS_PAM_MODULES_PATH +" + diff --git a/remote/modules/rsyslogd/module.conf.centos b/remote/modules/rsyslogd/module.conf.centos new file mode 100644 index 00000000..6f3cb891 --- /dev/null +++ b/remote/modules/rsyslogd/module.conf.centos @@ -0,0 +1,3 @@ +REQUIRED_CONTENT_PACKAGES=" + rsyslog +" diff --git a/remote/modules/smartctl/module.conf.centos b/remote/modules/smartctl/module.conf.centos new file mode 100644 index 00000000..d699f2f0 --- /dev/null +++ b/remote/modules/smartctl/module.conf.centos @@ -0,0 +1,6 @@ +REQUIRED_CONTENT_PACKAGES=" + smartmontools +" +REQUIRED_INSTALLED_PACKAGES=" + smartmontools +" diff --git a/remote/modules/systemd/module.conf.centos b/remote/modules/systemd/module.conf.centos new file mode 100644 index 00000000..9232ea5f --- /dev/null +++ b/remote/modules/systemd/module.conf.centos @@ -0,0 +1,11 @@ +REQUIRED_INSTALLED_PACKAGES=" + intltool + gperf + libcap-devel + libudev-devel + dbus-devel + libxslt + libblkid-devel + libacl-devel + glib2-devel +" diff --git a/remote/modules/xorg/module.conf.centos b/remote/modules/xorg/module.conf.centos new file mode 100644 index 00000000..ff5846e3 --- /dev/null +++ b/remote/modules/xorg/module.conf.centos @@ -0,0 +1,67 @@ +# xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse +REQUIRED_INSTALLED_PACKAGES=" + xorg-x11-server-Xorg + xorg-x11-drv-vmware + xorg-x11-drv-ati + xorg-x11-drv-nouveau + xorg-x11-drv-intel + xorg-x11-drv-vesa + xorg-x11-drv-fbdev + xorg-x11-drv-modesetting + xorg-x11-drv-vmmouse + xorg-x11-drv-wacom + xorg-x11-drv-evdev + xorg-x11-drv-keyboard + xorg-x11-drv-mouse + xorg-x11-drv-synaptics + xorg-x11-drv-void + xkeyboard-config + dejavu-sans-fonts + libxcb + mesa-dri-drivers + mesa-libGL + xorg-x11-xkb-utils + xorg-x11-xkb-extras + pixman + xorg-x11-server-utils +" +REQUIRED_CONTENT_PACKAGES=" + xorg-x11-server-Xorg + xorg-x11-drv-vmware + xorg-x11-drv-ati + xorg-x11-drv-nouveau + xorg-x11-drv-intel + xorg-x11-drv-vesa + xorg-x11-drv-fbdev + xorg-x11-drv-modesetting + xorg-x11-drv-vmmouse + xorg-x11-drv-wacom + xorg-x11-drv-evdev + xorg-x11-drv-keyboard + xorg-x11-drv-mouse + xorg-x11-drv-synaptics + xorg-x11-drv-void + xkeyboard-config + dejavu-sans-fonts + libxcb + mesa-dri-drivers + mesa-libGL + xorg-x11-xkb-utils + xorg-x11-xkb-extras + pixman + xorg-x11-server-utils +" +REQUIRED_LIBRARIES=" + libxcb-glx + libIntelXvMC + i965_dri + vmwgfx_dri + i915_dri + libpixman-1 +" +REQUIRED_DIRECTORIES+=" + /usr/bin + /usr/lib/udev + /usr/$LIB64/xorg + /usr/share/fonts +" diff --git a/remote/rootfs/rootfs-stage32/module.conf.centos b/remote/rootfs/rootfs-stage32/module.conf.centos new file mode 100644 index 00000000..da290670 --- /dev/null +++ b/remote/rootfs/rootfs-stage32/module.conf.centos @@ -0,0 +1,17 @@ +REQUIRED_INSTALLED_PACKAGES=" + ntpdate + nfs-utils + xfsprogs + squashfs-tools + curl + xvidtune + xterm +" +REQUIRED_CONTENT_PACKAGES=" +" +REQUIRED_DIRECTORIES=" + /usr/$LIB64/xtables +" +REQUIRED_FILES+=" + /usr/share/X11/app-defaults/Xvidtune +" diff --git a/remote/targets/stage32-headless/cron b/remote/targets/stage32-headless/cron new file mode 120000 index 00000000..39164da5 --- /dev/null +++ b/remote/targets/stage32-headless/cron @@ -0,0 +1 @@ +../../modules/cron \ No newline at end of file diff --git a/remote/targets/stage32-headless/dbus b/remote/targets/stage32-headless/dbus new file mode 120000 index 00000000..dd148715 --- /dev/null +++ b/remote/targets/stage32-headless/dbus @@ -0,0 +1 @@ +../../modules/dbus \ No newline at end of file diff --git a/remote/targets/stage32-headless/dhcpc-busybox b/remote/targets/stage32-headless/dhcpc-busybox new file mode 120000 index 00000000..ea3634e6 --- /dev/null +++ b/remote/targets/stage32-headless/dhcpc-busybox @@ -0,0 +1 @@ +../../modules/dhcpc-busybox \ No newline at end of file diff --git a/remote/targets/stage32-headless/dnbd3 b/remote/targets/stage32-headless/dnbd3 new file mode 120000 index 00000000..fa80b45c --- /dev/null +++ b/remote/targets/stage32-headless/dnbd3 @@ -0,0 +1 @@ +../../modules/dnbd3 \ No newline at end of file diff --git a/remote/targets/stage32-headless/german b/remote/targets/stage32-headless/german new file mode 120000 index 00000000..4469f96e --- /dev/null +++ b/remote/targets/stage32-headless/german @@ -0,0 +1 @@ +../../modules/german \ No newline at end of file diff --git a/remote/targets/stage32-headless/idleaction b/remote/targets/stage32-headless/idleaction new file mode 120000 index 00000000..09fd9493 --- /dev/null +++ b/remote/targets/stage32-headless/idleaction @@ -0,0 +1 @@ +../../modules/idleaction \ No newline at end of file diff --git a/remote/targets/stage32-headless/kernel b/remote/targets/stage32-headless/kernel new file mode 120000 index 00000000..044f086d --- /dev/null +++ b/remote/targets/stage32-headless/kernel @@ -0,0 +1 @@ +../../modules/kernel \ No newline at end of file diff --git a/remote/targets/stage32-headless/nscd b/remote/targets/stage32-headless/nscd new file mode 120000 index 00000000..d7e411d2 --- /dev/null +++ b/remote/targets/stage32-headless/nscd @@ -0,0 +1 @@ +../../modules/nscd \ No newline at end of file diff --git a/remote/targets/stage32-headless/pam b/remote/targets/stage32-headless/pam new file mode 120000 index 00000000..588acdbf --- /dev/null +++ b/remote/targets/stage32-headless/pam @@ -0,0 +1 @@ +../../modules/pam \ No newline at end of file diff --git a/remote/targets/stage32-headless/rootfs-stage32 b/remote/targets/stage32-headless/rootfs-stage32 new file mode 120000 index 00000000..96dcbb86 --- /dev/null +++ b/remote/targets/stage32-headless/rootfs-stage32 @@ -0,0 +1 @@ +../../rootfs/rootfs-stage32 \ No newline at end of file diff --git a/remote/targets/stage32-headless/rsyslogd b/remote/targets/stage32-headless/rsyslogd new file mode 120000 index 00000000..339d02f8 --- /dev/null +++ b/remote/targets/stage32-headless/rsyslogd @@ -0,0 +1 @@ +../../modules/rsyslogd \ No newline at end of file diff --git a/remote/targets/stage32-headless/smartctl b/remote/targets/stage32-headless/smartctl new file mode 120000 index 00000000..3a48434f --- /dev/null +++ b/remote/targets/stage32-headless/smartctl @@ -0,0 +1 @@ +../../modules/smartctl \ No newline at end of file diff --git a/remote/targets/stage32-headless/sshd b/remote/targets/stage32-headless/sshd new file mode 120000 index 00000000..56b4e4b5 --- /dev/null +++ b/remote/targets/stage32-headless/sshd @@ -0,0 +1 @@ +../../modules/sshd \ No newline at end of file diff --git a/remote/targets/stage32-headless/systemd b/remote/targets/stage32-headless/systemd new file mode 120000 index 00000000..2dc58bd3 --- /dev/null +++ b/remote/targets/stage32-headless/systemd @@ -0,0 +1 @@ +../../modules/systemd \ No newline at end of file diff --git a/remote/targets/stage32-headless/xorg b/remote/targets/stage32-headless/xorg new file mode 120000 index 00000000..a9494860 --- /dev/null +++ b/remote/targets/stage32-headless/xorg @@ -0,0 +1 @@ +../../modules/xorg \ No newline at end of file -- cgit v1.2.3-55-g7522