pkgbase-stage.lua: Add '*-jail-dbg' variant to dvd1

- Add *-jail-dbg variant to dvd1 to match the non-jail variant;
- Remove assertion introduced in the previous commit for consistency with existing

pkgbase-stage.lua: Add '*-jail-dbg' variant to dvd1

- Add *-jail-dbg variant to dvd1 to match the non-jail variant;
- Remove assertion introduced in the previous commit for consistency with existing code.

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1991

show more ...

pkgbase-stage.lua: Add *-jail metapackages to the offline repo

Having *-jail metapackage variants on the installation media allows convenient offline jail creation.

Reviewed by: imp
Pull Request: h

pkgbase-stage.lua: Add *-jail metapackages to the offline repo

Having *-jail metapackage variants on the installation media allows convenient offline jail creation.

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1991

show more ...

pkgbase-stage: Use unique PKG_DBDIR

Prior to this commit, pkgbase-stage.lua used a hard-coded PKG_DBDIR
"./pkgdb"; unfortunately this creates a race condition if we start
building disc1.iso and dvd1

pkgbase-stage: Use unique PKG_DBDIR

Prior to this commit, pkgbase-stage.lua used a hard-coded PKG_DBDIR
"./pkgdb"; unfortunately this creates a race condition if we start
building disc1.iso and dvd1.iso at the same time

pkg: sqlite error while executing CREATE TABLE licenses [...]
in file pkgdb.c:2330: table licenses already exists

since pkg checks to see if the pkgdb is initialized and initializes
it if not.

Use separate pkgdb-disc1 and pkgdb-dvd directories.

MFC after: 1 minute
Sponsored by: https://www.patreon.com/cperciva
Differential Revision: https://reviews.freebsd.org/D52755

show more ...

release: create pkgbase repo config from Makefile

This will allow the VM image build scripts to use the same repository
config file for installing base system packages at build time.

Reviewed by: e

release: create pkgbase repo config from Makefile

This will allow the VM image build scripts to use the same repository
config file for installing base system packages at build time.

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D51482

show more ...

release: Improve kernel package handling

Although support for PowerPC kernels (GENERIC64 and GENERIC64LE) was
added to pkgbase-stage.lua, the equivalent support was missing from
bsdinstall, so the i

release: Improve kernel package handling

Although support for PowerPC kernels (GENERIC64 and GENERIC64LE) was
added to pkgbase-stage.lua, the equivalent support was missing from
bsdinstall, so the installer would fail at runtime since it wouldn't
find a kernel package.

Improve the pkgbase-stage logic to have a specific list of kernels
we want to support (which avoids breaking if multiple kernels are
available), and use the same logic in both bsdinstall and pkgbase-stage.

MFC after: 1 day
Reviewed by: cperciva
Differential Revision: https://reviews.freebsd.org/D52638

show more ...

pkgbase-stage.lua: Add pkg package to the offline repo

We need a pkg package on the media so we can install it for offline
installations; copy this package from the staging repository to the
pkgbase

pkgbase-stage.lua: Add pkg package to the offline repo

We need a pkg package on the media so we can install it for offline
installations; copy this package from the staging repository to the
pkgbase offline repository on the media.

MFC after: 1 day
Reviewed by: ifreund_freebsdfoundation.org, cperciva
Differential Revision: https://reviews.freebsd.org/D52636

show more ...

release: use sets to select base packages

The introduction of package sets allows us to replace the current
fragile string matching with this simpler and more robust alternative.

Sponsored by: The

release: use sets to select base packages

The introduction of package sets allows us to replace the current
fragile string matching with this simpler and more robust alternative.

Sponsored by: The FreeBSD Foundation
MFC after: 3 seconds
Reviewed by: emaste, ivy
Differential Revision: https://reviews.freebsd.org/D52592

show more ...

release: Allow powerpc GENERIC64(le)? kernels

The pkgbase-stage.lua script asserts that it has exactly one "kernel",
but only accepts GENERIC as a "kernel". Use a slightly more permissive
regex in

release: Allow powerpc GENERIC64(le)? kernels

The pkgbase-stage.lua script asserts that it has exactly one "kernel",
but only accepts GENERIC as a "kernel". Use a slightly more permissive
regex in order to capture kernels with names which start "GENERIC".

Reviwed by: ivy
MFC after: 12 hours
Sponsored by: https://www.patreon.com/cperciva
Differential Revision: https://reviews.freebsd.org/D52544

show more ...

release: Pass ABI to pkgbase-stage.lua

We then pass ABI from pkgbase-stage.lua to pkg(8); without this,
cross-building releases with PKGBASE enabled fails with

pkg: wrong architecture: ...
pkg: rep

release: Pass ABI to pkgbase-stage.lua

We then pass ABI from pkgbase-stage.lua to pkg(8); without this,
cross-building releases with PKGBASE enabled fails with

pkg: wrong architecture: ...
pkg: repository FreeBSD-base contains packages with wrong ABI: ...

MFC after: 1 minute
Discussed with: emaste, jrtc27
Sponsored by: https://www.patreon.com/c/cperciva

show more ...

release, bsdinstall: include FreeBSD-kernel-man package

This package has been newly split off during man page reorganization and
should be considered part of the "base" component rather than being
i

release, bsdinstall: include FreeBSD-kernel-man package

This package has been newly split off during man page reorganization and
should be considered part of the "base" component rather than being
ignored. Update pkgbase release and bsdinstall scripts for this change.

Reviewed by: ivy
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D51519

show more ...

release: Add -DPKGBASE option to include pkgbase packages

If this option is set, an offline repo of pkgbase packages corresponding
to base.txz and kernel.txz will be included in the disc1 release me

release: Add -DPKGBASE option to include pkgbase packages

If this option is set, an offline repo of pkgbase packages corresponding
to base.txz and kernel.txz will be included in the disc1 release media
rather than the base.txz and kernel.txz tarballs.

Reviewed by: bapt
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D50346

show more ...

pkgbase-stage: Use unique PKG_DBDIR

Prior to this commit, pkgbase-stage.lua used a hard-coded PKG_DBDIR
"./pkgdb"; unfortunately this creates a race condition if we start
building disc1.iso and dvd1

pkgbase-stage: Use unique PKG_DBDIR

Prior to this commit, pkgbase-stage.lua used a hard-coded PKG_DBDIR
"./pkgdb"; unfortunately this creates a race condition if we start
building disc1.iso and dvd1.iso at the same time

pkg: sqlite error while executing CREATE TABLE licenses [...]
in file pkgdb.c:2330: table licenses already exists

since pkg checks to see if the pkgdb is initialized and initializes
it if not.

Use separate pkgdb-disc1 and pkgdb-dvd directories.

MFC after: 1 minute
Sponsored by: https://www.patreon.com/cperciva
Differential Revision: https://reviews.freebsd.org/D52755

show more ...

release: create pkgbase repo config from Makefile

This will allow the VM image build scripts to use the same repository
config file for installing base system packages at build time.

Reviewed by: e

release: create pkgbase repo config from Makefile

This will allow the VM image build scripts to use the same repository
config file for installing base system packages at build time.

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D51482

show more ...

release: Improve kernel package handling

Although support for PowerPC kernels (GENERIC64 and GENERIC64LE) was
added to pkgbase-stage.lua, the equivalent support was missing from
bsdinstall, so the i

release: Improve kernel package handling

Although support for PowerPC kernels (GENERIC64 and GENERIC64LE) was
added to pkgbase-stage.lua, the equivalent support was missing from
bsdinstall, so the installer would fail at runtime since it wouldn't
find a kernel package.

Improve the pkgbase-stage logic to have a specific list of kernels
we want to support (which avoids breaking if multiple kernels are
available), and use the same logic in both bsdinstall and pkgbase-stage.

MFC after: 1 day
Reviewed by: cperciva
Differential Revision: https://reviews.freebsd.org/D52638

show more ...

pkgbase-stage.lua: Add pkg package to the offline repo

We need a pkg package on the media so we can install it for offline
installations; copy this package from the staging repository to the
pkgbase

pkgbase-stage.lua: Add pkg package to the offline repo

We need a pkg package on the media so we can install it for offline
installations; copy this package from the staging repository to the
pkgbase offline repository on the media.

MFC after: 1 day
Reviewed by: ifreund_freebsdfoundation.org, cperciva
Differential Revision: https://reviews.freebsd.org/D52636

show more ...

release: use sets to select base packages

The introduction of package sets allows us to replace the current
fragile string matching with this simpler and more robust alternative.

Sponsored by: The

release: use sets to select base packages

The introduction of package sets allows us to replace the current
fragile string matching with this simpler and more robust alternative.

Sponsored by: The FreeBSD Foundation
MFC after: 3 seconds
Reviewed by: emaste, ivy
Differential Revision: https://reviews.freebsd.org/D52592

show more ...

release: Allow powerpc GENERIC64(le)? kernels

The pkgbase-stage.lua script asserts that it has exactly one "kernel",
but only accepts GENERIC as a "kernel". Use a slightly more permissive
regex in

release: Allow powerpc GENERIC64(le)? kernels

The pkgbase-stage.lua script asserts that it has exactly one "kernel",
but only accepts GENERIC as a "kernel". Use a slightly more permissive
regex in order to capture kernels with names which start "GENERIC".

Reviwed by: ivy
MFC after: 12 hours
Sponsored by: https://www.patreon.com/cperciva
Differential Revision: https://reviews.freebsd.org/D52544

show more ...

release: Pass ABI to pkgbase-stage.lua

We then pass ABI from pkgbase-stage.lua to pkg(8); without this,
cross-building releases with PKGBASE enabled fails with

pkg: wrong architecture: ...
pkg: rep

release: Pass ABI to pkgbase-stage.lua

We then pass ABI from pkgbase-stage.lua to pkg(8); without this,
cross-building releases with PKGBASE enabled fails with

pkg: wrong architecture: ...
pkg: repository FreeBSD-base contains packages with wrong ABI: ...

MFC after: 1 minute
Discussed with: emaste, jrtc27
Sponsored by: https://www.patreon.com/c/cperciva

show more ...

release, bsdinstall: include FreeBSD-kernel-man package

This package has been newly split off during man page reorganization and
should be considered part of the "base" component rather than being
i

release, bsdinstall: include FreeBSD-kernel-man package

This package has been newly split off during man page reorganization and
should be considered part of the "base" component rather than being
ignored. Update pkgbase release and bsdinstall scripts for this change.

Reviewed by: ivy
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D51519

show more ...

release: Add -DPKGBASE option to include pkgbase packages

If this option is set, an offline repo of pkgbase packages corresponding
to base.txz and kernel.txz will be included in the disc1 release me

release: Add -DPKGBASE option to include pkgbase packages

If this option is set, an offline repo of pkgbase packages corresponding
to base.txz and kernel.txz will be included in the disc1 release media
rather than the base.txz and kernel.txz tarballs.

Reviewed by: bapt
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D50346

show more ...

pkgbase-stage: Use unique PKG_DBDIR

Prior to this commit, pkgbase-stage.lua used a hard-coded PKG_DBDIR
"./pkgdb"; unfortunately this creates a race condition if we start
building disc1.iso and dvd1

pkgbase-stage: Use unique PKG_DBDIR

Prior to this commit, pkgbase-stage.lua used a hard-coded PKG_DBDIR
"./pkgdb"; unfortunately this creates a race condition if we start
building disc1.iso and dvd1.iso at the same time

pkg: sqlite error while executing CREATE TABLE licenses [...]
in file pkgdb.c:2330: table licenses already exists

since pkg checks to see if the pkgdb is initialized and initializes
it if not.

Use separate pkgdb-disc1 and pkgdb-dvd directories.

MFC after: 1 minute
Sponsored by: https://www.patreon.com/cperciva
Differential Revision: https://reviews.freebsd.org/D52755

show more ...

release: create pkgbase repo config from Makefile

This will allow the VM image build scripts to use the same repository
config file for installing base system packages at build time.

Reviewed by: e

release: create pkgbase repo config from Makefile

This will allow the VM image build scripts to use the same repository
config file for installing base system packages at build time.

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D51482

show more ...

release: Improve kernel package handling

Although support for PowerPC kernels (GENERIC64 and GENERIC64LE) was
added to pkgbase-stage.lua, the equivalent support was missing from
bsdinstall, so the i

release: Improve kernel package handling

Although support for PowerPC kernels (GENERIC64 and GENERIC64LE) was
added to pkgbase-stage.lua, the equivalent support was missing from
bsdinstall, so the installer would fail at runtime since it wouldn't
find a kernel package.

Improve the pkgbase-stage logic to have a specific list of kernels
we want to support (which avoids breaking if multiple kernels are
available), and use the same logic in both bsdinstall and pkgbase-stage.

MFC after: 1 day
Reviewed by: cperciva
Differential Revision: https://reviews.freebsd.org/D52638

show more ...

pkgbase-stage.lua: Add pkg package to the offline repo

We need a pkg package on the media so we can install it for offline
installations; copy this package from the staging repository to the
pkgbase

pkgbase-stage.lua: Add pkg package to the offline repo

We need a pkg package on the media so we can install it for offline
installations; copy this package from the staging repository to the
pkgbase offline repository on the media.

MFC after: 1 day
Reviewed by: ifreund_freebsdfoundation.org, cperciva
Differential Revision: https://reviews.freebsd.org/D52636

show more ...

release: use sets to select base packages

The introduction of package sets allows us to replace the current
fragile string matching with this simpler and more robust alternative.

Sponsored by: The

release: use sets to select base packages

The introduction of package sets allows us to replace the current
fragile string matching with this simpler and more robust alternative.

Sponsored by: The FreeBSD Foundation
MFC after: 3 seconds
Reviewed by: emaste, ivy
Differential Revision: https://reviews.freebsd.org/D52592

show more ...