Fixed some issues in the patches dowload code.
This commit is contained in:
parent
aebe03a487
commit
8742984c53
1 changed files with 4 additions and 4 deletions
8
jhalfs
8
jhalfs
|
@ -388,9 +388,9 @@ get_sources() {
|
|||
for i in `cat $JHALFSDIR/packages` ; do
|
||||
PKG=`echo $i | sed 's/-version.*//'`
|
||||
# Needed for Groff patchlevel patch on UTF-8 branch
|
||||
GROFFLEVEL=`echo $i | sed -e 's/groff-patchlevel //' -e 's/"//g'`
|
||||
GROFFLEVEL=`grep "groff-patchlevel" $JHALFSDIR/packages | sed -e 's/groff-patchlevel //' -e 's/"//g'`
|
||||
# Needed for IPRoute2 patch on 6.1.1 book
|
||||
IPROUTE2PATCH=`echo $i | sed -e 's/iproute2-patch-version //' -e 's/"//g'`
|
||||
IPROUTE2PATCH=`grep "iproute2-patch" $JHALFSDIR/packages | sed -e 's/iproute2-patch-version //' -e 's/"//g'`
|
||||
|
||||
# There is some entities that aren't valid package entities.
|
||||
if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" -o "$PKG" = "groff-patchlevel" -o "$PKG" = "iproute2-patch" ] ; then continue ; fi
|
||||
|
@ -404,7 +404,7 @@ get_sources() {
|
|||
download $PKG $FILE
|
||||
for patch in `grep "$PKG-&$PKG" $JHALFSDIR/patches` ; do
|
||||
if [ "$patch" = "iproute2-&iproute2-patch-version;-remove_db-1.patch" ] ; then
|
||||
PATCH=`echo $patch | sed 's@&'$PKG'-patch-version;@'$IPROUTE2PATCH'@'`
|
||||
PATCH=`echo $patch | sed 's@&iproute2-patch-version;@'$IPROUTE2PATCH'@'`
|
||||
download $PKG $PATCH
|
||||
else
|
||||
PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
|
||||
|
@ -412,7 +412,7 @@ get_sources() {
|
|||
fi
|
||||
done
|
||||
# Needed for Groff patchlevel patch on UTF-8 branch
|
||||
for patch in `grep "$PKG_&$PKG" $JHALFSDIR/patches` ; do
|
||||
for patch in `grep "patchlevel" $JHALFSDIR/patches` ; do
|
||||
PATCH=`echo $patch | sed 's@&'$PKG'-version;-&'$PKG'-patchlevel;@'$VRS'-'$GROFFLEVEL'@'`
|
||||
download $PKG $PATCH
|
||||
done
|
||||
|
|
Reference in a new issue