View | Details | Raw Unified | Return to bug 278273 | Differences between
and this patch

Collapse All | Expand All

(-)b/release/scripts/pkg-stage.sh (-12 / +11 lines)
Lines 8-14 export ASSUME_ALWAYS_YES="YES" Link Here
8
export PKG_DBDIR="/tmp/pkg"
8
export PKG_DBDIR="/tmp/pkg"
9
export PERMISSIVE="YES"
9
export PERMISSIVE="YES"
10
export REPO_AUTOUPDATE="NO"
10
export REPO_AUTOUPDATE="NO"
11
export PKGCMD="/usr/sbin/pkg -d"
11
export ROOTDIR="$PWD/dvd"
12
export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}"
12
export PORTSDIR="${PORTSDIR:-/usr/ports}"
13
export PORTSDIR="${PORTSDIR:-/usr/ports}"
13
14
14
_DVD_PACKAGES="archivers/unzip
15
_DVD_PACKAGES="archivers/unzip
Lines 48-61 if [ ! -x /usr/local/sbin/pkg ]; then Link Here
48
	/usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean
49
	/usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean
49
fi
50
fi
50
51
51
export DVD_DIR="dvd/packages"
52
export PKG_ABI=$(pkg --rootdir ${ROOTDIR} config ABI)
52
export PKG_ABI=$(pkg config ABI)
53
export PKG_ALTABI=$(pkg --rootdir ${ROOTDIR} config ALTABI 2>/dev/null)
53
export PKG_ALTABI=$(pkg config ALTABI 2>/dev/null)
54
export PKG_REPODIR="packages/${PKG_ABI}"
54
export PKG_REPODIR="${DVD_DIR}/${PKG_ABI}"
55
55
56
/bin/mkdir -p ${PKG_REPODIR}
56
/bin/mkdir -p ${ROOTDIR}/${PKG_REPODIR}
57
if [ ! -z "${PKG_ALTABI}" ]; then
57
if [ ! -z "${PKG_ALTABI}" ]; then
58
	(cd ${DVD_DIR} && ln -s ${PKG_ABI} ${PKG_ALTABI})
58
	ln -s ${PKG_ABI} ${ROOTDIR}/packages/${PKG_ALTABI}
59
fi
59
fi
60
60
61
# Ensure the ports listed in _DVD_PACKAGES exist to sanitize the
61
# Ensure the ports listed in _DVD_PACKAGES exist to sanitize the
Lines 84-94 ${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES} Link Here
84
84
85
# Create the 'Latest/pkg.txz' symlink so 'pkg bootstrap' works
85
# Create the 'Latest/pkg.txz' symlink so 'pkg bootstrap' works
86
# using the on-disc packages.
86
# using the on-disc packages.
87
mkdir -p ${PKG_REPODIR}/Latest
87
export LATEST_DIR="${ROOTDIR}/${PKG_REPODIR}/Latest"
88
(cd ${PKG_REPODIR}/Latest && \
88
mkdir -p ${ROOTDIR}/${PKG_REPODIR}/Latest
89
	ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).pkg pkg.pkg)
89
ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).pkg ${LATEST_DIR}/pkg.pkg
90
(cd ${PKG_REPODIR}/Latest && \
90
ln -sf pkg.pkg ${LATEST_DIR}/pkg.txz
91
	rm -f pkg.txz && ln -s pkg.pkg pkg.txz)
92
91
93
${PKGCMD} repo ${PKG_REPODIR}
92
${PKGCMD} repo ${PKG_REPODIR}

Return to bug 278273