summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinitramfs/mkdxsinitrd8
-rw-r--r--installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm1
2 files changed, 8 insertions, 1 deletions
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 545add5a..fef86d76 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -395,6 +395,8 @@ DISTRO_VER=${VENDOR_OS#*-}
# drop distro type, keep from version onwards
DISTRO_VER=${DISTRO_VER%%-*}
# remove any optional stuff after version
+DISTRO_VER=${DISTRO_VER%%_*}
+ # remove any architecture specification after version
copy_distro_stuff ${DISTRO_NAME} ${DISTRO_VER}
@@ -509,7 +511,11 @@ case "${DISTRO_NAME}" in
cp ${ROOTDIR}/lib/libnss_compat.so.2 ${INSTDIR}/lib;;
esac
-# copy all libraries that have been determined to be required:
+# add libpci.so to the libraries, as we are going to copy it manually:
+slxldd --root-path=${ROOTDIR} ${SLX_SHARE_PATH}/initramfs/lib/libpci.so.2 \
+ >>${INSTDIR}/tmp/libraries
+
+# now copy all libraries that have been determined to be required:
# first we handle all 64-bit libs...
for lib in $(fgrep /lib64/ ${INSTDIR}/tmp/libraries 2>/dev/null|sort -u); do
if ! [ -d ${INSTDIR}/lib64 ] ; then
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
index f690165b..cf2ed96f 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
@@ -138,6 +138,7 @@ sub initDistroInfo
x86_64/findutils-4.2.28-24.x86_64.rpm
x86_64/gawk-3.1.5-41.x86_64.rpm
x86_64/gdbm-1.8.3-261.x86_64.rpm
+ x86_64/glibc-32bit-2.5-25.x86_64.rpm
x86_64/gpg-1.4.5-24.x86_64.rpm
x86_64/grep-2.5.1a-40.x86_64.rpm
x86_64/gzip-1.3.5-178.x86_64.rpm