Page MenuHomeFreeBSD
Files F146351121

D52638.id.diff
No OneTemporary
Actions

D52638.id.diff
View Options

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
@@ -20,19 +20,26 @@
-- Returns a list of packages to be included in the given media
local function select_packages(pkg, media, all_libcompats)
+ -- Note: if you update this list, you must also update the list in
+ -- usr.sbin/bsdinstall/scripts/pkgbase.in.
+ local kernel_packages = {
+ -- Most architectures use this
+ ["FreeBSD-kernel-generic"] = true,
+ -- PowerPC uses either of these, depending on platform
+ ["FreeBSD-kernel-generic64"] = true,
+ ["FreeBSD-kernel-generic64le"] = true,
+ }
+
local components = {}
local rquery = capture(pkg .. "rquery -U -r FreeBSD-base %n")
for package in rquery:gmatch("[^\n]+") do
local set = package:match("^FreeBSD%-set%-(.*)$")
if set then
components[set] = package
- -- Kernels other than FreeBSD-kernel-generic are ignored
- -- Note that on powerpc64 and powerpc64le the names are
- -- slightly different.
- elseif package:match("^FreeBSD%-kernel%-generic.*-dbg") then
- components["kernel-dbg"] = package
- elseif package:match("^FreeBSD%-kernel%-generic.*") then
+ elseif kernel_packages[package] then
components["kernel"] = package
+ elseif kernel_packages[package:match("(.*)%-dbg$")] then
+ components["kernel-dbg"] = package
elseif package == "pkg" then
components["pkg"] = package
end
diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in
--- a/usr.sbin/bsdinstall/scripts/pkgbase.in
+++ b/usr.sbin/bsdinstall/scripts/pkgbase.in
@@ -182,6 +182,16 @@
["debug"] = {},
}
+ -- Note: if you update this list, you must also update the list in
+ -- release/scripts/pkgbase-stage.lua.
+ local kernel_packages = {
+ -- Most architectures use this
+ ["FreeBSD-kernel-generic"] = true,
+ -- PowerPC uses either of these, depending on platform
+ ["FreeBSD-kernel-generic64"] = true,
+ ["FreeBSD-kernel-generic64le"] = true,
+ }
+
local rquery = capture(pkg .. "rquery -U -r FreeBSD-base %n")
for package in rquery:gmatch("[^\n]+") do
local setname = package:match("^FreeBSD%-set%-(.+)$")
@@ -189,15 +199,10 @@
if setname then
components[setname] = components[setname] or {}
table.insert(components[setname], package)
- elseif package:match("^FreeBSD%-kernel%-.*") and
- package ~= "FreeBSD-kernel-man"
- then
- -- Kernels other than FreeBSD-kernel-generic are ignored
- if package == "FreeBSD-kernel-generic" then
- table.insert(components["kernel"], package)
- elseif package == "FreeBSD-kernel-generic-dbg" then
- table.insert(components["kernel-dbg"], package)
- end
+ elseif kernel_packages[package] then
+ table.insert(components["kernel"], package)
+ elseif kernel_packages[package:match("(.*)%-dbg$")] then
+ table.insert(components["kernel-dbg"], package)
end
end

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 2, 11:55 PM (9 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29158480
Default Alt Text
D52638.id.diff (2 KB)

Event Timeline