tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: make update fails in pkg_install



On Tue, Jun 16, 2009 at 11:50:37AM -0500, Jeremy C. Reed wrote:
> I don't think the "update:" target in 
> pkgsrc/pkgtools/pkg_install/Makefile is even used.

It is, but it seems to never really have worked for su-operation correctly.
Attached patch is a preliminary fix.

Joerg
Index: mk/install/deinstall.mk
===================================================================
RCS file: /home/joerg/repo/netbsd/pkgsrc/mk/install/deinstall.mk,v
retrieving revision 1.9
diff -u -p -r1.9 deinstall.mk
--- mk/install/deinstall.mk     20 Aug 2007 10:59:05 -0000      1.9
+++ mk/install/deinstall.mk     16 Jun 2009 16:30:01 -0000
@@ -40,7 +40,7 @@ su-deinstall: ${_SU_DEINSTALL_TARGETS}
 acquire-deinstall-lock: acquire-localbase-lock
 release-deinstall-lock: release-localbase-lock
 
-MAKEFLAGS.su-deinstall=        DEINSTALLDEPENDS=${DEINSTALLDEPENDS}
+MAKEFLAGS.su-deinstall+=       DEINSTALLDEPENDS=${DEINSTALLDEPENDS}
 
 ######################################################################
 ### reinstall (PUBLIC)
Index: pkgtools/pkg_install/Makefile
===================================================================
RCS file: /home/joerg/repo/netbsd/pkgsrc/pkgtools/pkg_install/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- pkgtools/pkg_install/Makefile       14 Jun 2009 15:08:45 -0000      1.164
+++ pkgtools/pkg_install/Makefile       16 Jun 2009 16:30:31 -0000
@@ -165,4 +165,6 @@ update:
        ${MAKE} ${UPDATE_TARGET}
        ${MAKE} clean
 
+MAKEFLAGS.su-deinstall+=       _UPDATE_RUNNING=YES
+
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index