Merge pull request #303 from rear/rear-1.15

fixing dangling symlink on SLES 32-bit platforms (OBS) while creating RPM
rear · Sep 18, 2013 · 4eefcae · 4eefcae
2 parents 26bd4c0 + 627d387
commit 4eefcae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/usr/share/rear/build/NSR/default/55_add_nsr_libs_to_ldsoconf.sh b/usr/share/rear/build/NSR/default/55_add_nsr_libs_to_ldsoconf.sh
@@ -0,0 +1,8 @@
+# 55_add_nsr_libs_to_ldsoconf.sh
+if [[ -f $ROOTFS_DIR/etc/ld.so.conf ]]; then
+     Log "Add NSR library paths to etc/ld.so.conf"
+     cat >> $ROOTFS_DIR/etc/ld.so.conf <<-EOD
+	/usr/lib/nsr
+	/usr/lib/nsr/lib64
+	EOD
+fi
diff --git a/usr/share/rear/skel/NSR/usr/lib/nsr/.gitignore b/usr/share/rear/skel/NSR/usr/lib/nsr/.gitignore
diff --git a/usr/share/rear/skel/NSR/usr/lib/nsr/lib64 b/usr/share/rear/skel/NSR/usr/lib/nsr/lib64