diff options
| author | Simon Rettberg | 2013-06-24 18:43:49 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-06-24 18:43:49 +0200 |
| commit | 2eaf90f03b68b0b18653a3932ad40da4890d8d25 (patch) | |
| tree | d9d4a8906d1fac9cdbdf085023755a5367678b46 /remote/modules | |
| parent | [rootfs-stage31] delay fetching config by 1 second, kernel might not have rou... (diff) | |
| parent | Some glibc-libs (libnss_compat, libbnss_db, libnss_dns, libnss_files, libnss_... (diff) | |
| download | tm-scripts-2eaf90f03b68b0b18653a3932ad40da4890d8d25.tar.gz tm-scripts-2eaf90f03b68b0b18653a3932ad40da4890d8d25.tar.xz tm-scripts-2eaf90f03b68b0b18653a3932ad40da4890d8d25.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/openbox/openbox.build | 12 | ||||
| -rw-r--r-- | remote/modules/pam/pam.conf.zypper | 14 |
2 files changed, 25 insertions, 1 deletions
diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build index 51c6beec..f3ce1448 100644 --- a/remote/modules/openbox/openbox.build +++ b/remote/modules/openbox/openbox.build @@ -16,5 +16,15 @@ build() { post_copy() { [ ! -d "$TARGET_BUILD_DIR/etc/pango" ] && mkdir -p "$TARGET_BUILD_DIR/etc/pango" - pango-querymodules > "$TARGET_BUILD_DIR/etc/pango/pango.modules" + + # little Workaround, as under e.g. 64bit Suse the binary is called + # pango-querymodules-64, not pango-querymodules. + which pango-querymodules 2>/dev/null 1>&2 + ERR=$? + if [[ "$ERR" -ne 0 ]]; then + PANGO_QUERYMODULES_ARCH=pango-querymodules-64 + else + PANGO_QUERYMODULES_ARCH=pango-querymodules + fi + $PANGO_QUERYMODULES_ARCH > "$TARGET_BUILD_DIR/etc/pango/pango.modules" } diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper index 48dc1d52..403cd59f 100644 --- a/remote/modules/pam/pam.conf.zypper +++ b/remote/modules/pam/pam.conf.zypper @@ -7,6 +7,7 @@ REQUIRED_INSTALLED_PACKAGES=" libopenssl-devel openldap2-client nfsidmap + glibc " REQUIRED_CONTENT_PACKAGES=" pam_ldap @@ -17,12 +18,25 @@ REQUIRED_CONTENT_PACKAGES=" nss-mdns openldap2-client nfsidmap + glibc " REQUIRED_BINARIES=" sslconnect ldapsearch mkhomedir_helper " +REQUIRED_LIBRARIES=" + nsswitch + static + umich_ldap + libnfsidmap + libnss_compat + libnss_db + libnss_dns + libnss_files + libnss_nis +" + REQUIRED_DIRECTORIES=" /$LIB64 /usr/$LIB64 |