diff options
| author | Jonathan Bauer | 2013-06-13 15:33:26 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-06-13 15:33:26 +0200 |
| commit | dfa3b4b7a6208605c9461b6a857533680a600bb0 (patch) | |
| tree | 0ce448ce43fec114d5d9840c9b5c1a6d682d77af | |
| parent | [xorg] add pacakge libgl1-mesa-glx needed for libGL.so.1 (diff) | |
| parent | [xorg] remove /lib/udev from config (diff) | |
| download | tm-scripts-dfa3b4b7a6208605c9461b6a857533680a600bb0.tar.gz tm-scripts-dfa3b4b7a6208605c9461b6a857533680a600bb0.tar.xz tm-scripts-dfa3b4b7a6208605c9461b6a857533680a600bb0.zip | |
merge
| -rw-r--r-- | remote/modules/pam/pam.conf | 20 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf | 5 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 1 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper | 1 | ||||
| -rwxr-xr-x | remote/setup_target | 2 |
5 files changed, 25 insertions, 4 deletions
diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/pam.conf index 2d334b52..94356d45 100644 --- a/remote/modules/pam/pam.conf +++ b/remote/modules/pam/pam.conf @@ -1,6 +1,10 @@ REQUIRED_INSTALLED_PACKAGES=" libpam-ldap libnss-ldap - libpam-script" + libpam-script + krb5-user + krb5-config + libpam-krb5 + libpam-mount" REQUIRED_CONTENT_PACKAGES=" libpam0g libpam-modules libpam-ck-connector @@ -8,7 +12,19 @@ REQUIRED_CONTENT_PACKAGES=" libpam0g libpam-script libldap-2.4-2 libpam-ldap - libnss-ldap" + libnss-ldap + krb5-user + krb5-config + libpam-krb5 + libpam-mount" +REQUIRED_BINARIES=" mount.crypt + umount.crypt + mount.crypt_LUKS + umount.crypt_LUKS + mount.crypto_LUKS + umount.crypto_LUKS + perl" +REQUIRED_SYSTEM_FILES=" /lib/security/pam_mount.so" REQUIRED_DIRECTORIES=" /lib /usr/lib /etc/security" diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf index 74d162e7..a3e5e6a0 100644 --- a/remote/modules/xorg/xorg.conf +++ b/remote/modules/xorg/xorg.conf @@ -41,8 +41,13 @@ REQUIRED_BINARIES=" Xorg xkbbell xkbevd vmmouse_detect" +<<<<<<< HEAD REQUIRED_DIRECTORIES=" /usr/lib /usr/share/X11 " +======= +REQUIRED_DIRECTORIES=" /usr/lib + /usr/share/X11" +>>>>>>> a39f240dae983bdb9e2ba081483f55e8dfdc2e43 REQUIRED_FILES="" diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf index 5437621d..049c9e08 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf @@ -63,7 +63,6 @@ REQUIRED_FILES=" /etc/modprobe.d/blacklist.conf /etc/fonts/fonts.conf /etc/X11/app-defaults/Xvidtune - /etc/ld.so.cache " REQUIRED_KERNEL_MODULES=" kernel/drivers/cpufreq kernel/drivers/memstick diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper index 70fa2a2f..f52db58f 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper @@ -31,7 +31,6 @@ REQUIRED_FILES=" /etc/networks /etc/netconfig /usr/share/X11/app-defaults/Xvidtune - /etc/ld.so.cache " REQUIRED_KERNEL_MODULES=" kernel/drivers/cpufreq kernel/drivers/memstick diff --git a/remote/setup_target b/remote/setup_target index 4ea1cbc2..b0565550 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -314,6 +314,8 @@ post_process_target() { rm -r "${TARGET_BUILD_DIR}/lib/systemd" fi + ldconfig -r "${TARGET_BUILD_DIR}" + } clean_modules() { |