Page MenuHomeFreeBSD
Files F167942803

D52755.id.diff
No OneTemporary
Actions

D52755.id.diff
View Options

diff --git a/release/Makefile b/release/Makefile
--- a/release/Makefile
+++ b/release/Makefile
@@ -134,7 +134,7 @@
.if defined(WITH_DVD) && !empty(WITH_DVD)
CLEANFILES+= pkg-stage
.endif
-CLEANDIRS= dist pkgdb pkgbase-repo pkgbase-repo-dir ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd
+CLEANDIRS= dist pkgdb-dvd pkgdb-disc1 pkgbase-repo pkgbase-repo-dir ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd
beforeclean:
chflags -R noschg .
.include <bsd.obj.mk>
@@ -229,7 +229,7 @@
${.CURDIR}/scripts/pkgbase-stage.lua disc \
${.OBJDIR}/pkgbase-repo-dir \
${.TARGET}/usr/freebsd-packages/offline \
- "${_ALL_libcompats}" ${PKG_ABI}
+ "${_ALL_libcompats}" ${PKG_ABI} ${.OBJDIR}/pkgdb-disc1
cp ${.CURDIR}/scripts/FreeBSD-base-offline.conf \
${.TARGET}/usr/freebsd-packages/repos/
mtree -c -p ${.TARGET}/usr/freebsd-packages | \
@@ -329,7 +329,7 @@
${.CURDIR}/scripts/pkgbase-stage.lua dvd \
${.OBJDIR}/pkgbase-repo-dir \
${.TARGET}/usr/freebsd-packages/offline \
- "${_ALL_libcompats}" ${PKG_ABI}
+ "${_ALL_libcompats}" ${PKG_ABI} ${.OBJDIR}/pkgdb-dvd
cp ${.CURDIR}/scripts/FreeBSD-base-offline.conf \
${.TARGET}/usr/freebsd-packages/repos/
mtree -c -p ${.TARGET}/usr/freebsd-packages | \
diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua
--- a/release/scripts/pkgbase-stage.lua
+++ b/release/scripts/pkgbase-stage.lua
@@ -89,10 +89,12 @@
local all_libcompats = assert(arg[4])
-- ABI of repository
local ABI = assert(arg[5])
+ -- pkgdb to use
+ local PKGDB = assert(arg[6])
local pkg = "pkg -o ASSUME_ALWAYS_YES=yes -o IGNORE_OSVERSION=yes " ..
"-o ABI=" .. ABI .. " " ..
- "-o INSTALL_AS_USER=1 -o PKG_DBDIR=./pkgdb -R " .. repo_dir .. " "
+ "-o INSTALL_AS_USER=1 -o PKG_DBDIR=" .. PKGDB .. " -R " .. repo_dir .. " "
assert(os.execute(pkg .. "update"))

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 26, 1:24 PM (17 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37299565
Default Alt Text
D52755.id.diff (1 KB)

Event Timeline