Browse Source

Add workaround for gmp library install

Georgi Chorbadzhiyski 14 years ago
parent
commit
dd060075df
2 changed files with 9 additions and 3 deletions
  1. 4
    3
      slcheck.sh
  2. 5
    0
      update_script.sh

+ 4
- 3
slcheck.sh View File

@@ -1,7 +1,7 @@
1 1
 #!/bin/sh
2 2
 # SlackCheck
3 3
 #
4
-# $Id: slcheck.sh,v 1.44 2010/01/04 07:39:40 gf Exp $
4
+# $Id: slcheck.sh,v 1.45 2010/03/02 12:28:54 gf Exp $
5 5
 #
6 6
 # Copyright (c) 2002-2006 Georgi Chorbadzhiyski, Sofia, Bulgaria
7 7
 # All rights reserved.
@@ -24,7 +24,7 @@
24 24
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 25
 #
26 26
 
27
-echo "SlackCheck v3.90"
27
+echo "SlackCheck v3.91"
28 28
 echo
29 29
 
30 30
 cd $(dirname $0)
@@ -188,7 +188,7 @@ generate_upgrade_scripts() {
188 188
 					then
189 189
 						UPDATED=$(($UPDATED + 1))
190 190
 						echo "\
191
-UPDATE=\"\$UPDATE ${distro_package_ext}\" # EXISTING: ${hostpkg} \
191
+UPDATE=\"\$UPDATE ${distro_package_ext}\" # EXISTING: ${hostpkg}\
192 192
 " >> ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs
193 193
 						if [ "$VERBOSE" == "1" ]; then
194 194
 							echo "  UPD: $hostpkg -> $distropkg ($distro_package_ext)"
@@ -272,6 +272,7 @@ UPDATE=\"\$UPDATE ${distro_package_ext}\" # EXISTING: ${hostpkg} \
272 272
 				 cat ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs | grep a/glibc
273 273
 				 cat ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs | grep a/elflibs
274 274
 				 cat ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs | grep -v -E "a/(pkgtools|tar|glibc|elflibs)"
275
+				 echo "PKG_GMP=\"`grep gmp- ${DIR_PKG}/${FILE_NEWEST} 2>/dev/null`\"";
275 276
 				 echo "PKG_LIBCAP=\"`grep libcap- ${DIR_PKG}/${FILE_NEWEST} 2>/dev/null`\"";
276 277
 				 echo "PKG_XZ=\"`grep xz- ${DIR_PKG}/${FILE_NEWEST} 2>/dev/null`\"";
277 278
 				 echo "PKG_SED=\"`grep sed- ${DIR_PKG}/${FILE_NEWEST} 2>/dev/null`\"";

+ 5
- 0
update_script.sh View File

@@ -144,6 +144,11 @@ mkdir ${REMOTE_DIR} 2>/dev/null
144 144
 	if [ "$PKG_XZ" != "" -a ! -x "/bin/xz" ]; then
145 145
 		pkg_install "xz is not installed. Installing it." $PKG_XZ
146 146
 	fi
147
+	# UGLY HACK #3, to upgrade from 13.0 to -current you need
148
+	# coreutils-8.4 has new dependency for the expr program
149
+	if [ "$PKG_GMP" != "" -a ! -f "/usr/lib/libgmp.la" ]; then
150
+		pkg_install "gmp is not installed. Installing it." $PKG_GMP
151
+	fi
147 152
 	for PKG in $UPDATE; do
148 153
 		upgradepkg `basename $PKG`
149 154
 		# UGLY HACK! sed was split from 'bin' package and

Loading…
Cancel
Save