Date: Fri, 8 Aug 2014 01:26:31 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364336 - in head/sysutils/debootstrap: . files Message-ID: <53e42748.2f33.4244a5db@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Fri Aug 8 01:26:31 2014 New Revision: 364336 URL: http://svnweb.freebsd.org/changeset/ports/364336 QAT: https://qat.redports.org/buildarchive/r364336/ Log: sysutils/debootstrap: runtime fixes - Add a runtime dependency on Perl - Fix --foreign bootstrap - Fix HOST_ARCH detection with dpkg - Add a runtime dependency on dpkg PR: 179766 Submitted by: maintainer Modified: head/sysutils/debootstrap/Makefile head/sysutils/debootstrap/files/patch-debootstrap Modified: head/sysutils/debootstrap/Makefile ============================================================================== --- head/sysutils/debootstrap/Makefile Fri Aug 8 01:19:07 2014 (r364335) +++ head/sysutils/debootstrap/Makefile Fri Aug 8 01:26:31 2014 (r364336) @@ -3,6 +3,7 @@ PORTNAME= debootstrap PORTVERSION= 1.0.60 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/d/${PORTNAME} @@ -11,11 +12,13 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= lifanov@mail.lifanov.com COMMENT= Install Debian base system into a directory -RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget +RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget \ + dpkg:${PORTSDIR}/archivers/dpkg WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} NO_BUILD= yes -USES= gmake tar:xz +USES= gmake perl5 tar:xz +USE_PERL5= run MAKE_ARGS= DESTDIR="${STAGEDIR}" ONLY_FOR_ARCHS= i386 amd64 Modified: head/sysutils/debootstrap/files/patch-debootstrap ============================================================================== --- head/sysutils/debootstrap/files/patch-debootstrap Fri Aug 8 01:19:07 2014 (r364335) +++ head/sysutils/debootstrap/files/patch-debootstrap Fri Aug 8 01:26:31 2014 (r364336) @@ -1,5 +1,5 @@ --- ./debootstrap.orig 2014-02-07 10:25:58.000000000 -0500 -+++ ./debootstrap 2014-08-06 19:34:46.435155899 -0400 ++++ ./debootstrap 2014-08-07 20:46:10.626600981 -0400 @@ -13,7 +13,7 @@ if [ -x /debootstrap/debootstrap ]; then DEBOOTSTRAP_DIR=/debootstrap @@ -9,6 +9,19 @@ fi fi +@@ -399,10 +399,10 @@ + + if in_path dpkg && \ + dpkg --print-architecture >/dev/null 2>&1; then +- HOST_ARCH=`/usr/bin/dpkg --print-architecture` ++ HOST_ARCH=`%%PREFIX%%/bin/dpkg --print-architecture` + elif in_path udpkg && \ + udpkg --print-architecture >/dev/null 2>&1; then +- HOST_ARCH=`/usr/bin/udpkg --print-architecture` ++ HOST_ARCH=`%%PREFIX%%/bin/udpkg --print-architecture` + elif [ -e $DEBOOTSTRAP_DIR/arch ]; then + HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch` + fi @@ -425,6 +425,10 @@ esac fi @@ -20,3 +33,11 @@ if [ -z "$ARCH" ]; then ARCH=$HOST_ARCH fi +@@ -621,7 +625,6 @@ + if ! am_doing_phase second_stage; then + cp "$0" "$TARGET/debootstrap/debootstrap" + cp $DEBOOTSTRAP_DIR/functions "$TARGET/debootstrap/functions" +- cp $DEBOOTSTRAP_DIR/devices.tar.gz "$TARGET/debootstrap/devices.tar.gz" + cp $SCRIPT "$TARGET/debootstrap/suite-script" + echo "$ARCH" >"$TARGET/debootstrap/arch" + echo "$SUITE" >"$TARGET/debootstrap/suite"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e42748.2f33.4244a5db>