Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to add custom packages #165

Merged
merged 2 commits into from
Mar 3, 2021
Merged

Add ability to add custom packages #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e4ed05
Add ability to add custom packages
crees Feb 26, 2021
a4f1dd6
Only fetch experimental packages from cirrus
crees Feb 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,19 @@ packages()
mount_nullfs ${packages} ${uzip}/var/cache/pkg
mount -t devfs devfs ${uzip}/dev
# FIXME: In the following line, the hardcoded "i386" needs to be replaced by "${arch}" - how?
cat "${cwd}/settings/packages.common-${MAJOR}" | sed '/^#/d' | sed '/\!i386/d' | xargs /usr/local/sbin/pkg-static -c "${uzip}" install -y
cat "${cwd}/settings/packages.${desktop}" | sed '/^#/d' | sed '/\!i386/d' | xargs /usr/local/sbin/pkg-static -c "${uzip}" install -y

for p in common-${MAJOR} ${desktop}; do
sed '/^#/d;/\!i386/d;/^cirrus:/d' "${cwd}/settings/packages.$p" | \
xargs /usr/local/sbin/pkg-static -c "${uzip}" install -y
pkg_cachedir=/var/cache/pkg
mkdir -p ${uzip}${pkg_cachedir}/furybsd-cirrus
for url in $(sed -ne "s,^cirrus:,https://api.cirrus-ci.com/v1/artifact/,;s,%%ARCH%%,$arch,;s,%%VER%%,$VER,p" "${cwd}/settings/packages.$p"); do
pkgfile=${url##*/}
if [ ! -e ${uzip}${pkg_cachedir}/furybsd-cirrus/${pkgfile} ]; then
fetch -o ${uzip}${pkg_cachedir}/furybsd-cirrus/ $url
fi
/usr/local/sbin/pkg-static -c "${uzip}" add ${pkg_cachedir}/furybsd-cirrus/${pkgfile}
done
done
# Install the packages we have generated in pkg() that are listed in transient-packages-list
ls -lh "${packages}/transient/"
while read -r p; do
Expand All @@ -196,12 +206,6 @@ packages()
/usr/local/sbin/pkg-static -r ${uzip} add "${packages}/transient/${p}" # pkg-static add has no -y
done <"${packages}/transient/transient-packages-list"

# Workaround for kernel-related packages being broken in the default package repository
# as long as the previous dot release is still supported; FIXME
# https://forums.freebsd.org/threads/i915kms-package-breaks-on-12-2-release-workaround-build-from-ports.77501/
# FIXME: Add https://darkness-pi.monwarez.ovh/posts/synth-repository/ properly. How?
# IGNORE_OSVERSION=yes /usr/local/sbin/pkg-static -c "${uzip}" add https://darkness-pi.monwarez.ovh/amd64/All/drm-fbsd12.0-kmod-4.16.g20200221.txz
# For now we are just going back to using 12.1 rather than 12.2
/usr/local/sbin/pkg-static -c ${uzip} info > "${cdroot}/data/system.uzip.manifest"
cp "${cdroot}/data/system.uzip.manifest" "${isopath}.manifest"
rm ${uzip}/etc/resolv.conf
Expand Down
6 changes: 3 additions & 3 deletions settings/packages.common-12
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@ xf86-input-mouse
xf86-input-vmmouse
xf86-video-ati
xf86-video-cirrus
xf86-video-intel
xf86-video-scfb
xf86-video-vesa
xf86-video-vmware
xf86-video-qxl # !i386
drm-kmod
drm-legacy-kmod
libva-intel-driver
drm-kmod
# nvidia-driver # !i386 # Is now handled in build.sh initgfx()
mesa-libs
mesa-dri
gpu-firmware-kmod
open-vm-tools
virtualbox-ose-additions
xauth
Expand Down Expand Up @@ -60,3 +59,4 @@ b43-fwcutter
dsbdriverd
# Control screen brightness on some Intel-based machines including MacBook Pro
intel-backlight
cirrus:github/crees/drm-kmod-FreeBSD-12/main/binaries/drm-fbsd12.0-kmod-%%VER%%%%ARCH%%.txz