diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 14 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 11 |
2 files changed, 4 insertions, 21 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index eb0d2e69d..688804e3a 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -69,12 +69,6 @@ TOPDIR=$(cd $TOPDIR; pwd) CRAMBS="" fi - if [ ! -d "$1" ]; then - LATEST="rsh porkchop latest --arch $BUILDARCH" - else - LATEST=findPackage - fi - if [ $BUILDARCH = x86_64 -o $BUILDARCH = s390x ]; then LIBDIR=lib64 else @@ -938,17 +932,17 @@ fi foundakernel="" for KERNELARCH in $arches; do for kernelvers in $vertag; do - kpackage=$($LATEST $KERNELPATH kernel-$kernelvers) + kpackage=$(findPackage $KERNELPATH kernel-$kernelvers) if [ ! -f "$kpackage" ]; then echo "kernel-$kernelvers does not exist for $KERNELARCH -- using kernel package" - kpackage=$($LATEST $KERNELPATH kernel) + kpackage=$(findPackage $KERNELPATH kernel) kernelvers="" fi if [ "$KERNELARCH" = "i586" -a ! -f "$kpackage" ]; then echo "No i586 kernel, trying i686..." KERNELARCH="i686" - kpackage=$($LATEST $KERNELPATH kernel) + kpackage=$(findPackage $KERNELPATH kernel) fi if [ ! -f "$kpackage" ]; then @@ -961,7 +955,7 @@ for KERNELARCH in $arches; do foundakernel="yes" - ppackage=$($LATEST $KERNELPATH hwdata) + ppackage=$(findPackage $KERNELPATH hwdata) if [ ! -f "$ppackage" ]; then ppackage="" fi diff --git a/scripts/upd-instroot b/scripts/upd-instroot index abf1cfb51..716bd7135 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -25,7 +25,6 @@ if [ ! -d $1 ]; then echo "ARCH must be set" >&2 exit 1 fi - LATEST="latest --arch $ARCH" fi PACKAGEDIR=$1 @@ -46,16 +45,6 @@ prunePackageList() { PACKAGEPATH=$1 PACKAGES="$2" - if [ -n "$LATEST" ]; then - $LATEST $PACKAGEPATH $PACKAGES - if [ $? != 0 ]; then - $LATEST $PACKAGEPATH $PACKAGES >&2 - kill -9 $$ - fi - - return - fi - PATTERN="" PACKAGEFILES="" for PKG in $PACKAGES; do |