Commits

Uelsk8s  committed 8c17aa2 Merge

Merged in m0e_lnx/m0e-vabs (pull request #95)

os-prober update to 1.63

  • Participants
  • Parent commits 123c397, c94d944

Comments (0)

Files changed (2)

File var/vabs/os-prober/src/os-prober.SlackBuild

 # AUTHORS = 
 
 NAME="os-prober"            #Enter package Name!
-VERSION=${VERSION:-"1.62"}      #Enter package Version!
+VERSION=${VERSION:-"1.63"}      #Enter package Version!
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"Uelsk8s"}   #Enter your Name!
 LINK=${LINK:-"http://ftp.de.debian.org/debian/pool/main/o/$NAME/${NAME}_$VERSION.tar.gz"}  #Enter URL for package here!
 # Put any Patches here *NOTE this only works if all 
 # your patches use the -p1 strip option!
 #-----------------------------------------------------
-for i in $CWD/patches/*;do
-  patch -p1 <$i
-  mkdir -p $PKG/usr/doc/$NAME-$VERSION/patches/
+mkdir -p $PKG/usr/doc/$NAME-$VERSION/patches
+for i in $CWD/patches/* ; do
   cp $i $PKG/usr/doc/$NAME-$VERSION/patches/
 done
+patch --verbose -Np1 < $CWD/patches/os-prober-VL.patch || exit 1
+# Dont drop support for reiserfs.  It's still in the kernel and we do have it in the default ISO
+zcat $CWD/patches/os-prober.reiserfs.diff.gz | patch -p1 --verbose || exit 1
+
+# Edit scripts to use $LIBDIRSUFFIX if needed
+if [ "$LIBDIRSUFFIX" = "64" ]; then
+	find -type f -exec sed -i -e "s|usr/lib|usr/lib64|g" {} \;
+fi
 #-----------------------------------------------------
- 
- 
+
 
 #SET PERMISSIONS
 #-----------------------------------------
 
 make || exit 1
 
-mkdir -p $PKG/var/lib/$NAME
-
+#mkdir -p $PKG/var/lib${LIBDIRSUFFIX}/$NAME
 mkdir -p $PKG/usr/bin
-cp linux-boot-prober $PKG/usr/bin
-cp os-prober $PKG/usr/bin
-
-mkdir -p $PKG/usr/lib/$NAME
-cp newns $PKG/usr/lib/$NAME
-
-mkdir -p $PKG/usr/lib/os-probes
-cp os-probes/common/* $PKG/usr/lib/os-probes
-mkdir -p $PKG/usr/lib/os-probes/mounted
-cp os-probes/mounted/common/* $PKG/usr/lib/os-probes/mounted
-cp os-probes/mounted/x86/* $PKG/usr/lib/os-probes/mounted
-
-mkdir -p $PKG/usr/lib/os-probes/init
-cp os-probes/init/common/* $PKG/usr/lib/os-probes/init
-
-mkdir -p $PKG/usr/lib/linux-boot-probes
-cp linux-boot-probes/common/* $PKG/usr/lib/linux-boot-probes/
-chmod -x $PKG/usr/lib/linux-boot-probes/mounted/90fallback # This produces bad output on VL
-mkdir $PKG/usr/lib/linux-boot-probes/mounted
-cp linux-boot-probes/mounted/common/* $PKG/usr/lib/linux-boot-probes/mounted
-cp linux-boot-probes/mounted/x86/* $PKG/usr/lib/linux-boot-probes/mounted
-
-mkdir -p $PKG/usr/share/$NAME
-cp common.sh $PKG/usr/share/$NAME
-chmod +x $PKG/usr/share/$NAME/common.sh
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+for ex in linux-boot-prober os-prober ; do
+	cp $ex $PKG/usr/bin/ || exit 1
+done
+for dir in linux-boot-probes os-probes ; do
+	cp -ar $dir $PKG/usr/lib${LIBDIRSUFFIX}/ || exit 1
+done
+
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/linux-boot-probes
+	for probe in common/* ; do
+		ln -sf $probe .
+	done
+	cd mounted || exit 1
+	for probe in common/* x86/* ; do
+		ln -sf $probe .
+	done
+) || exit 1
+
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/os-probes
+	for probe in common/* ; do
+		ln -sf $probe .
+	done
+	cd init || exit 1
+	for probe in common/* ; do
+		ln -sf $probe .
+	done
+	cd ../mounted || exit 1
+	for probe in common/* ; do
+		ln -sf $probe .
+	done
+) || exit 1
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/os-prober
+cp -a newns $PKG/usr/lib${LIBDIRSUFFIX}/os-prober/
+mkdir -p $PKG/usr/share/os-prober
+cp -a common.sh $PKG/usr/share/os-prober/
+mkdir -p $PKG/var/lib/os-prober
+
+chmod -x $PKG/usr/lib${LIBDIRSUFFIX}/linux-boot-probes/mounted/90fallback # This produces bad results in the search
 
 
 #######################################################################

File var/vabs/os-prober/src/patches/os-prober.reiserfs.diff.gz

Binary file added.