On Fri, Aug 7, 2009 at 2:19 AM, Eric Bélanger<[email protected]> wrote:
> Hi,
>
> Here (inline and attached) are a couple of patches for makechrootpkg.
>


Here's a second patch.  It fixes the copying of the package from the
chroot when the pkgver or pkgrel are different (e.g. device-mapper &
lvm2) :

--- /usr/sbin/makechrootpkg     2009-08-06 23:44:28.000000000 -0400
+++ makechrootpkg       2009-08-09 21:57:39.000000000 -0400
@@ -230,7 +230,7 @@
     source ${WORKDIR}/PKGBUILD

     for _pkgname in ${pkgna...@]}; do
-       
pkgfile="${chrootdir}"/union/pkgdest/${_pkgname}-${pkgver}-${pkgrel}-*${PKGEXT}
+       pkgfile="${chrootdir}"/union/pkgdest/${_pkgname}-*${PKGEXT}

        if [ -n "$add_to_db" -a -e "$pkgfile" ]; then
             [ -d "${chrootdir}/union/repo" ] || mkdir -p
"${chrootdir}/union/repo"
--- /usr/sbin/makechrootpkg	2009-08-06 23:44:28.000000000 -0400
+++ makechrootpkg	2009-08-09 21:57:39.000000000 -0400
@@ -230,7 +230,7 @@
     source ${WORKDIR}/PKGBUILD
 
     for _pkgname in ${pkgna...@]}; do
-	pkgfile="${chrootdir}"/union/pkgdest/${_pkgname}-${pkgver}-${pkgrel}-*${PKGEXT}
+	pkgfile="${chrootdir}"/union/pkgdest/${_pkgname}-*${PKGEXT}
 
 	if [ -n "$add_to_db" -a -e "$pkgfile" ]; then
             [ -d "${chrootdir}/union/repo" ] || mkdir -p "${chrootdir}/union/repo"

Reply via email to