From c412a07545ec38e56d1007f6f55a9871340e6cf6 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sun, 13 Mar 2022 13:16:59 +0100 Subject: [PATCH] Fix packInstall.sh.porg for upower-vx.x --- jhalfs | 1 + pkgmngt/packInstall.sh.porg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jhalfs b/jhalfs index 3f51467..2f03b1f 100755 --- a/jhalfs +++ b/jhalfs @@ -357,6 +357,7 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then # Copy needed stylesheets cp "$COMMON_DIR"/{packages.xsl,chroot.xsl,kernfs.xsl} "$JHALFSDIR/" + cp "$PACKAGE_DIR/$XSL" "$JHALFSDIR/" export XSL=$JHALFSDIR/${XSL} diff --git a/pkgmngt/packInstall.sh.porg b/pkgmngt/packInstall.sh.porg index 88265e2..669eadf 100644 --- a/pkgmngt/packInstall.sh.porg +++ b/pkgmngt/packInstall.sh.porg @@ -77,7 +77,7 @@ case $1 in local PACKENT=$(dirname $JH_PACK_INSTALL)/blfs-xml/packages.ent VERSION=$(sed -n 's/.*x265[^0-9]*\([^"]*\).*/\1/p' $PACKENT) ;; - libuv*|Test-MockModule*) # can contain -vd.d or just -d.d + libuv*|Test-MockModule*|upower*) # can contain -vd.d or just -d.d VERSION=$(echo $1 | sed 's/^.*[v-]//') ;; junit*|inih*) # can contain -rd.d or just -d.d