Compare commits

...

2 Commits

Author SHA1 Message Date
Dustin 9c9a301f7f wip: use persistent volumes for portage, binpkgs
dustin/photoframe2/pipeline/pr-dev/ci There was a failure building this commit Details
2024-12-22 20:29:33 -06:00
Dustin b86d347683 wip: Install Firefox 2024-12-22 20:29:29 -06:00
11 changed files with 99 additions and 4 deletions

6
ci/Jenkinsfile vendored
View File

@ -9,6 +9,12 @@ pipeline {
} }
stages { stages {
stage('Prepare') {
steps {
sh '. ./prepare.sh'
}
}
stage('Build') { stage('Build') {
steps { steps {
sh 'env -i PATH="${PATH}" make -C aimee-os CONFIGDIR=${PWD} O=/build' sh 'env -i PATH="${PATH}" make -C aimee-os CONFIGDIR=${PWD} O=/build'

View File

@ -21,12 +21,21 @@ spec:
name: workspace-volume name: workspace-volume
subPath: gentoo subPath: gentoo
- mountPath: /usr/aarch64-unknown-linux-gnu/var/cache/binpkgs - mountPath: /usr/aarch64-unknown-linux-gnu/var/cache/binpkgs
name: workspace-volume name: binpkgs
subPath: binpkgs subPath: photoframe2
- mountPath: /var/cache/binpkgs - mountPath: /var/cache/binpkgs
name: workspace-volume name: binpkgs
subPath: binpkgs subPath: photoframe2
- mountPath: /var/cache/distfiles - mountPath: /var/cache/distfiles
name: workspace-volume name: workspace-volume
subPath: distfiles subPath: distfiles
- mountPath: /var/db/repos/gentoo
name: portage
hostUsers: false hostUsers: false
volumes:
- name: binpkgs
persistentVolumeClaim:
claimName: binpkgs
- name: portage
persistentVolumeClaim:
claimName: portage

View File

@ -1 +1,2 @@
net-wireless/wpa_supplicant net-wireless/wpa_supplicant
www-client/firefox

View File

@ -0,0 +1 @@
USE="${USE} -python -readline"

View File

@ -0,0 +1,4 @@
# Disable GObject introspection because it cannot be cross-compiled
# https://bugs.gentoo.org/850895
# https://bugs.gentoo.org/751325
USE="${USE} -introspection -vala"

View File

@ -0,0 +1 @@
VIDEO_CARDS='v3d vc4'

View File

@ -0,0 +1 @@
USE="${USE} -X wayland"

View File

@ -0,0 +1 @@
dev-libs/nss ~amd64

View File

@ -0,0 +1,6 @@
media-libs/harfbuzz -cairo
media-libs/libvpx postproc
media-libs/mesa -llvm wayland
media-video/ffmpeg openssl -gnutls
www-client/firefox -telemetry dbus wayland
x11-libs/gtk+ wayland

View File

@ -0,0 +1,48 @@
--- a/Makefile.in 2024-12-13 12:17:08.339616211 -0600
+++ b/Makefile.in 2024-12-13 12:18:30.301517960 -0600
@@ -641,12 +641,6 @@
rsvg/src/test_utils/reference_utils.rs \
rsvg-bench/Cargo.toml \
rsvg-bench/src/main.rs \
- rsvg_convert/tests/internal_predicates/file.rs \
- rsvg_convert/tests/internal_predicates/mod.rs \
- rsvg_convert/tests/internal_predicates/pdf.rs \
- rsvg_convert/tests/internal_predicates/png.rs \
- rsvg_convert/tests/internal_predicates/svg.rs \
- rsvg_convert/tests/rsvg_convert.rs \
librsvg-c/tests/legacy_sizing.rs \
gdk-pixbuf-loader/Cargo.toml \
gdk-pixbuf-loader/src/lib.rs \
@@ -685,15 +679,6 @@
librsvgincdir = $(includedir)/librsvg-$(RSVG_API_VERSION)/librsvg
librsvginc_HEADERS = $(librsvg_public_headers)
-# Use SCRIPTS instead of PROGRAMS since we build it on our own
-bin_SCRIPTS = rsvg-convert$(EXEEXT)
-RSVG_CONVERT_BIN = $(CARGO_TARGET_DIR)/$(RUST_TARGET_SUBDIR)/rsvg-convert$(EXEEXT)
-RSVG_CONVERT_SRC = \
- rsvg_convert/Cargo.toml \
- rsvg_convert/build.rs \
- rsvg_convert/src/main.rs \
- $(NULL)
-
@HAVE_RST2MAN_TRUE@man1_MANS = rsvg-convert.1
dist_doc_DATA = \
README.md \
@@ -1643,16 +1628,6 @@
$(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --package librsvg-c \
&& cd $(LIBRSVG_BUILD_DIR) && $(LINK) $< && cp $(RUST_LIB) .libs/librsvg_c_api.a
-$(RSVG_CONVERT_BIN): $(RSVG_CONVERT_SRC) | librsvg_c_api.la
- +cd $(top_srcdir) && \
- PKG_CONFIG_ALLOW_CROSS=1 \
- PKG_CONFIG='$(PKG_CONFIG)' \
- CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
- $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --package rsvg_convert
-
-rsvg-convert$(EXEEXT): $(RSVG_CONVERT_BIN)
- cd $(LIBRSVG_BUILD_DIR) && cp $(RSVG_CONVERT_BIN) rsvg-convert$(EXEEXT)
-
rsvg-convert.1: rsvg-convert.rst
@HAVE_RST2MAN_TRUE@ $(RST2MAN) $(top_srcdir)/rsvg-convert.rst rsvg-convert.1
@HAVE_RST2MAN_FALSE@ @echo "========================================"

17
prepare.sh Normal file
View File

@ -0,0 +1,17 @@
#!/bin/sh
if [ ! -f /var/db/repos/gentoo/metadata/timestamp ]; then
emerge-webrsync
else
emaint sync
fi
mkdir -p /etc/portage/package.use
mkdir -p /etc/portage/make.conf
cp portage/package.use/firefox /etc/portage/package.use/
cp portage/make.conf/introspection.conf /etc/portage/make.conf/
cp portage/make.conf/wayland.conf /etc/portage/make.conf/
xargs -r emerge -vbknuUj --rebuilt-binaries=y --color=y <<EOF
dev-libs/nss
EOF