Commit graph

32 commits

Author SHA1 Message Date
Colin Percival
0e771ca261 release: Don't put drm-kmod package onto DVD
The X.Y-RELEASE DVDs use a quarterly package set which was built on
X.(Y-1)-RELEASE, and those kernel modules are never going to be
useful.

Approved by:	re (cperciva)
MFC after:	30 seconds
Sponsored by:	Amazon

(cherry picked from commit 94e44a074e5212cc3459e360a9de55500f7c41d0)
(cherry picked from commit 1ecfdc009172491a133d596332a9aaf6851a49c1)
2025-05-11 15:23:21 -07:00
Colin Percival
a1874e9adf pkg-stage.sh: kde5 -> kde
The "kde5" package no longer exists; KDE goes to 6.

Note: Depending on the size of 13.5-BETA3 DVD images, KDE might end
up being removed from this list in the near future.

Approved by:	re (cperciva)
With hat:	re@
MFC after:	30 seconds
Sponsored by:	Amazon

(cherry picked from commit 0d7b98c06c5ec9638020844ee460af075cfc6e54)
(cherry picked from commit 1c2e947d272ea42dbf7416d867101fe5164ffc6d)
2025-05-11 15:23:14 -07:00
Dave Cottlehuber
7eab72fae6 release: ensure default sudo flavor is selected
pkg behaviour selects the non-default flavour, this trims
0,5GiB per cloudware image, by being explicit.

Approved by:	cperciva
Differential Revision:	https://reviews.freebsd.org/D48599
Sponsored by:	SkunkWerks, GmbH
PR:		284278
MFC after:	10 days

(cherry picked from commit 457d745d90a6b63793c9ca17bcd7ec5ff4cd8b93)
2025-04-08 18:58:08 +00:00
Bjoern A. Zeeb
f21cb43c91 release: add wifi-firmware-kmod@release to ship as package
Add the flavored port for all the
supported wireless drivers we recently added support for.

Sponsored by:	The FreeBSD Foundation
Pointed out by:	cperciva (as part of the set of changes)
Reviewed by:	cperciva (#releng)
Differential Revision: https://reviews.freebsd.org/D47406

(cherry picked from commit 2483a2d36803896d27861c03e1f53dd9546b1e73)
2024-11-14 01:52:01 +00:00
Colin Percival
0543cdc36a 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

(cherry picked from commit d31ed58b9f9360cecd9acfbd12999190edca6e56)
2024-05-23 17:06:50 -07:00
Graham Perrin
9317a4a3a8 pkg-stage.sh: add x11/sddm
MFC After: 2 days
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/996

(cherry picked from commit 5ff76402daf17b9c36048bf11957dac7556272a6)
2024-05-23 17:06:44 -07:00
John Baldwin
70dcf0608c 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

(cherry picked from commit ea2663040d524efd84b12edcbe83884437fdceea)
2024-04-16 22:43:27 -07:00
Warner Losh
d0b2dbfa0e Remove $FreeBSD$: one-line sh pattern
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
2023-08-16 11:55:03 -06:00
Li-Wen Hsu
fea4a44c19
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
2023-07-05 04:24:52 +08:00
Glen Barber
e4e139b828 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")
2023-03-20 10:36:51 -04:00
Alan Somers
55c8093f73 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
2022-05-27 09:10:19 -06:00
Glen Barber
68b0a79b7c release: fix on-disc pkg binary symbolic links
PR:		263574
Reported by:	loader
MFC after:	immediately
Sponsored by:	Rubicon Communications, LLC ("Netgate")
2022-04-26 15:52:40 -04:00
Glen Barber
e4a1a705bb 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
2018-10-10 19:57:10 +00:00
Glen Barber
dc39aae35e 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
2018-09-18 16:57:04 +00:00
Glen Barber
fefd043963 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
2017-05-22 14:21:45 +00:00
Ed Maste
868f280a54 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
2017-04-24 16:37:25 +00:00
Glen Barber
f8b0d3730f Replace linux-f10 packages with updated linux-c6.
PR: 		208280
Submitted by: 	Johannes Meixner
Sponsored by:	The FreeBSD Foundation
2016-05-27 18:20:07 +00:00
Glen Barber
2303632301 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
2015-01-08 15:50:10 +00:00
Glen Barber
0669938973 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
2015-01-08 15:42:10 +00:00
Glen Barber
6b7ca552c3 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
2015-01-08 14:39:53 +00:00
Glen Barber
ef6db57978 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
2015-01-08 14:29:03 +00:00
Glen Barber
83373daa35 Properly change directories before creating the
PKG_ALTABI -> PKG_ABI symlink.

MFC after:	3 days
X-MFC-With:	r276765
Sponsored by:	The FreeBSD Foundation
2015-01-06 20:46:29 +00:00
Glen Barber
8f85f8e66e 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
2015-01-06 20:42:50 +00:00
Glen Barber
83f0a683f4 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
2014-09-19 17:23:44 +00:00
Glen Barber
53bdd39b8a 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
2014-09-12 22:20:07 +00:00
Glen Barber
b60a2f70da Fix duplicate PKG_ABI in the PKG_CACHEDIR path.
MFC after:	3 days
X-MFC-With:	r271480
Sponsored by:	The FreeBSD Foundation
2014-09-12 20:16:55 +00:00
Glen Barber
017717d87f 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
2014-09-12 18:52:01 +00:00
Glen Barber
f0d60b2a4e 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
2014-05-22 19:22:03 +00:00
Glen Barber
6f50c4ea71 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
2014-01-16 16:12:09 +00:00
Glen Barber
89df2158c5 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
2013-12-12 05:49:27 +00:00
Glen Barber
4e11928ded 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
2013-12-02 14:28:30 +00:00
Glen Barber
042a51f641 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
2013-11-18 15:22:55 +00:00