History log of /freebsd-current/release/scripts/pkg-stage.sh
Revision Date Author Comments
# f81c0904f 23-May-2024 Colin Percival <cperciva@FreeBSD.org>

Add rtw88 firmware to DVD package set

Add net/wifi-firmware-rtw88-kmod since it is no longer included in
the base system on 15.x. (It is present in 14.x, so this change will
not be MFCed.)


# d31ed58b 20-May-2024 Colin Percival <cperciva@FreeBSD.org>

Modernize DVD package set in preparation for 14.1

Remove archivers/unzip (now in base) and emulators/linux_base-c7 (old
and unlikely to be useful without other linux packages being installed),
ports-mgmt/portmaster (now largely obsolete and discouraged in favour
of using pkg and binary packages) and x11-drivers/xf86-video-vmware
(questionably useful).

Replace devel/git with devel/git@lite (sufficient for most purposes),
and adjust the "ensure the ports exist to sanitize the list" code to
ignore the @lite part when checking that /usr/ports/devel/git exists.

Add sysutils/seatd and x11-wm/sway for wayland support.

MFC after: 1 minute
Differential Revision: https://reviews.freebsd.org/D45278


# ea266304 13-Apr-2024 John Baldwin <jhb@FreeBSD.org>

release: Use the ABI of the target release to fetch packages

- Point --rootdir at the installed destdir in the dvd tree. This
causes pkg to determine the ABI from the installed destdir instead
of the host's binaries. Previously the result was that packages
for the host's ABI were always downloaded breaking cross-releases
(e.g. arm64 releases built on an amd64 host included amd64
packages on the DVD ISO image rather than arm64 packages). This
also handles version mismatches, and I tested this by cross-building
a 15.x arm64 release on a 14.x amd64 host.

- As a result, pkg now does a chdir(3) to the rootdir before running,
so the -o argument to fetch needs to be updated to be relative to
rootdir instead of the CWD as make runs.

- Add a new ROOTDIR variable to limit references to "dvd" to one
place. Ideally ROOTDIR would be an argument to this script so
that it didn't really know about the dvd layout at all.

- While here, simplify creation of symlinks by just using a longer
path to the link name instead of using 'cd' in the shell before
invoking ln(1). Also use ln -sf to create the pkg.pkg symlink
rather than rm + ln.

PR: 278273
Reported by: gatekeeper <tiago.gasiba@gmail.com>
Reviewed by: imp, delphij
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D44749


# 5ff76402 02-Feb-2024 Graham Perrin <grahamperrin@gmail.com>

pkg-stage.sh: add x11/sddm

MFC After: 2 days
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/996


# d0b2dbfa 16-Aug-2023 Warner Losh <imp@FreeBSD.org>

Remove $FreeBSD$: one-line sh pattern

Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/


# fea4a44c 04-Jul-2023 Li-Wen Hsu <lwhsu@FreeBSD.org>

release/DVD_PACKAGES: Update the names of drm-kmod ports

Reviewed by: x11 (manu), re (gjb)
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D40770


# e4e139b8 20-Mar-2023 Glen Barber <gjb@FreeBSD.org>

pkg-stage.sh: update port trailing version information

Reported by: Ian Smith, Graham Perrin
MFC after: 1 week
X-MFC-13.2: NO

Sponsored by: Rubicon Communications, LLC ("Netgate")


# 55c8093f 26-May-2022 Alan Somers <asomers@FreeBSD.org>

Replace subversion with git in the installation DVD

I assume the original reason for Subversion's inclusion was to checkout
the base system. But now we use git for that.

Reviewed by: gjb
Sponsored by: Axcient
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D35329


# 68b0a79b 26-Apr-2022 Glen Barber <gjb@FreeBSD.org>

release: fix on-disc pkg binary symbolic links

PR: 263574
Reported by: loader
MFC after: immediately
Sponsored by: Rubicon Communications, LLC ("Netgate")


# e4a1a705 10-Oct-2018 Glen Barber <gjb@FreeBSD.org>

Add graphics/drm-legacy-kmod and graphics/drm-stable-kmod to the
list of packages to include on the dvd installer.

Approved by: re (marius, rgrimes)
Sponsored by: The FreeBSD Foundation


# dc39aae3 18-Sep-2018 Glen Barber <gjb@FreeBSD.org>

Update the pkg-stage.sh script used to populate packages on the
dvd1.iso installation medium from including KDE4 to KDE5, as the
KDE4-based ports have been marked as deprecated in the Ports
Collection.

MFC after: 3 days
Approved by: re (rgrimes)
Sponsored by: The FreeBSD Foundation


# fefd0439 22-May-2017 Glen Barber <gjb@FreeBSD.org>

Allow PORTSDIR to be overridden in the pkg-stage target.

Submitted by: Johannes Jost Meixner (original)
PR: 218393
MFC after: 3 days
Sponsored by: The FreeBSD Foundation


# 868f280a 24-Apr-2017 Ed Maste <emaste@FreeBSD.org>

Add sysutils/tmux to the DVD package set

The zsh + tmux combination is commonly wanted.

Approved by: gjb
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation


# f8b0d373 27-May-2016 Glen Barber <gjb@FreeBSD.org>

Replace linux-f10 packages with updated linux-c6.

PR: 208280
Submitted by: Johannes Meixner
Sponsored by: The FreeBSD Foundation


# 23036323 08-Jan-2015 Glen Barber <gjb@FreeBSD.org>

Switch to x11/gnome3 now that x11/gnome2 no
longer exists in the ports tree.

MFC after: 3 days
X-MFC-With: r276820, r276822, r276827
Sponsored by: The FreeBSD Foundation


# 06699389 08-Jan-2015 Glen Barber <gjb@FreeBSD.org>

Ensure the ports directories exist for the list of
packages intended to be included on the DVD, and
remove any nonexistent ports from the final list.

Print the list of missing paths, and ensure that
DVD_PACKAGES is non-zero length (which should never
happen).

MFC after: 3 days
X-MFC-With: r276820, r276822
Sponsored by: The FreeBSD Foundation


# 6b7ca552 08-Jan-2015 Glen Barber <gjb@FreeBSD.org>

Ensure /var/run/ld-elf.so.hints exists before building
pkg(8).

MFC after: 3 days
X-MFC-With: r276820
Sponsored by: The FreeBSD Foundation


# ef6db579 08-Jan-2015 Glen Barber <gjb@FreeBSD.org>

Print informational output when NOPORTS is set,
which would otherwise cause pkg-stage.sh to
silently exit.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation


# 83373daa 06-Jan-2015 Glen Barber <gjb@FreeBSD.org>

Properly change directories before creating the
PKG_ALTABI -> PKG_ABI symlink.

MFC after: 3 days
X-MFC-With: r276765
Sponsored by: The FreeBSD Foundation


# 8f85f8e6 06-Jan-2015 Glen Barber <gjb@FreeBSD.org>

Update pkg-stage.sh to be compatible with pkg-1.4.x.

In 1.3.x and earlier, ABI format is, for example,
freebsd:11:x86:64.

In 1.4.x, ABI format is FreeBSD:11:amd64, and a new
configuration entry, ALTABI, is: freebsd:11:x86:64.

Export PKG_ABI and PKG_ALTABI accordingly, and if
PKG_ALTABI is set, create a symlink within the dvd
PKG_CACHEDIR so both new and old ABI directories
exist.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation


# 83f0a683 19-Sep-2014 Glen Barber <gjb@FreeBSD.org>

When populating the dvd/packages/ directory, create
a symlink to All/pkg-*.txz in the Latest/ directory.

This allows 'pkg bootstrap' to work out-of-box if
the REPOS_DIR environment is properly set.

Tested on: stable/10@r271848
MFC after: 3 days
X-MFC-10.1: yes
Sponsored by: The FreeBSD Foundation


# 53bdd39b 12-Sep-2014 Glen Barber <gjb@FreeBSD.org>

Simplify dvd package population with pkg-1.3.

Submitted by: bdrewery
MFC after: 3 days
X-MFC-With: r271480, r271483
Sponsored by: The FreeBSD Foundation


# b60a2f70 12-Sep-2014 Glen Barber <gjb@FreeBSD.org>

Fix duplicate PKG_ABI in the PKG_CACHEDIR path.

MFC after: 3 days
X-MFC-With: r271480
Sponsored by: The FreeBSD Foundation


# 017717d8 12-Sep-2014 Glen Barber <gjb@FreeBSD.org>

Set PKG_CACHEDIR to an 'All/' directory one level lower
to fix 'pkg repo' generating repository metadata for the
on-disc packages.

MFC after: 3 days
X-MFC-to-10.1: yes
Sponsored by: The FreeBSD Foundation


# f0d60b2a 22-May-2014 Glen Barber <gjb@FreeBSD.org>

Add forward-compatibility glue with pkg-1.3:
- Use ASSUME_ALWAYS_YES=YES instead of ASSUME_ALWAYS_YES=1
since pkg-1.3 expects "yes" or "true" values.
- Before exporting PKG_ABI, strip extra characters from what
is parsed from 'pkg -vv'. This causes problems further down
when creating the packages directory for inclusion on the
dvd1.iso. Previously PKG_ABI would be 'freebsd:9:x86:64',
but now is '"freebsd:9:x86:64";' in pkg-1.3

Tested on: stable/9@r265858 with ports-mgmt/pkg-devel
MFC After: 3 days
Sponsored by: The FreeBSD Foundation


# 6f50c4ea 16-Jan-2014 Glen Barber <gjb@FreeBSD.org>

Update the pkg-stage target to be more compatible with pkg-1.2:

- Add a release-dvd.conf pkg(8) configuration file to override
the default FreeBSD.conf configuration.
- Remove architecture-specific pkg-stage.conf files, consolidate,
and move their contents to scripts/pkg-stage.sh.
- Use 'pkg -vv' to determine the ABI, which is used as the
cache directory.

Prior to these changes, it would be possible for pkg-stage to fetch
conflicting binary packages from multiple repositories.

Tested against: head@r260522, stable/10@r260522

MFC after: 3 days
X-Insta-MFC: possibly
Sponsored by: The FreeBSD Foundation


# 89df2158 11-Dec-2013 Glen Barber <gjb@FreeBSD.org>

Prevent release build errors found during snapshot builds where if
NOPORTS=1, pkg-stage.sh cannot build the ports-mgmt/pkg port if
WITH_DVD=1.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation


# 4e11928d 02-Dec-2013 Glen Barber <gjb@FreeBSD.org>

Provide reproducibility between builds by building pkg(8) from ports,
instead of using pkg-bootstrap.

This should resolve a problem that was discovered during 10.0-BETA4
freebsd-update(8) builds,

Reported by: secteam (delphij)
MFC after: 3 days
X-MFC-to-10: possibly immediately, pending freebsd-update(8) builds
Sponsored by: The FreeBSD Foundation


# 042a51f6 18-Nov-2013 Glen Barber <gjb@FreeBSD.org>

Add a script and configuration files to fetch pre-built packages
from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso).

The script sources ${.CURDIR}/${TARGET}/pkg-stage.conf, which sets
several environment variables, such as the pkg(8) ABI, PACKAGESITE,
PKG_DBDIR, and PKG_CACHEDIR. PKG_CACHEDIR is set to the directory
on the release medium used by bsdconfig(8) (/packages/${ABI}). ABI
is determined by output of 'make -C /usr/src/release -V REVISION'.
See pkg.conf(5) for descripton on other variables set here.

The list of packages to include are set within the configuration
file.

The script and configuration files are intended to be run by the
'make dvd' target within the release directory, and assume the
release is built within a chroot environment (such as by using
release.sh).

Relevant updates to release/Makefile will follow.

Sponsored by: The FreeBSD Foundation