Date: Sat, 13 Mar 2021 11:23:02 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568244 - head/sysutils/debootstrap Message-ID: <202103131123.12DBN29L036870@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Sat Mar 13 11:23:02 2021 New Revision: 568244 URL: https://svnweb.freebsd.org/changeset/ports/568244 Log: sysutils/debootstrap: make it work without --no-check-gpg Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29231 Modified: head/sysutils/debootstrap/Makefile head/sysutils/debootstrap/pkg-message Modified: head/sysutils/debootstrap/Makefile ============================================================================== --- head/sysutils/debootstrap/Makefile Sat Mar 13 11:06:46 2021 (r568243) +++ head/sysutils/debootstrap/Makefile Sat Mar 13 11:23:02 2021 (r568244) @@ -3,9 +3,9 @@ PORTNAME= debootstrap PORTVERSION= 1.0.123 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils -MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME} +MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= trasz@FreeBSD.org @@ -15,7 +15,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/debian/copyright RUN_DEPENDS= wget:ftp/wget \ - bash:shells/bash + bash:shells/bash \ + gpgv2:security/gnupg \ + ${LOCALBASE}/share/keyrings/ubuntu-archive-keyring.gpg:security/ubuntu-keyring WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes @@ -33,6 +35,12 @@ post-patch: @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ ${WRKSRC}/Makefile \ ${WRKSRC}/debootstrap + @${REINPLACE_CMD} -e 's,gpgv,gpgv2,g' \ + ${WRKSRC}/Makefile \ + ${WRKSRC}/debootstrap \ + ${WRKSRC}/functions + @${FIND} ${WRKSRC}/scripts -type f | \ + ${XARGS} ${REINPLACE_CMD} -e 's,/usr/share/keyrings,${LOCALBASE}/share/keyrings,g' post-install: ${INSTALL_MAN} ${WRKSRC}/debootstrap.8 \ Modified: head/sysutils/debootstrap/pkg-message ============================================================================== --- head/sysutils/debootstrap/pkg-message Sat Mar 13 11:06:46 2021 (r568243) +++ head/sysutils/debootstrap/pkg-message Sat Mar 13 11:23:02 2021 (r568244) @@ -6,9 +6,9 @@ debootstrap requires the following kernel modules to b linux64 fdescfs linprocfs linsysfs tmpfs -To install Ubuntu Bionic into /compat/ubuntu, use: +To install Ubuntu 18.04 LTS (Bionic Beaver) into /compat/ubuntu, run as root: -debootstrap --no-check-gpg bionic /compat/ubuntu +debootstrap bionic /compat/ubuntu EOM } ]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103131123.12DBN29L036870>