Catcrafts/fp6-img
Watch
2
0
Fork
You've already forked fp6-img
 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

build: actually wire the libcamera aport into the pmaports overlay
Some checks failed
image / image (push) Failing after 4m43s
Details

Browse source 
34cfc09 added aports/temp/libcamera but never taught build.sh to copy it,
so run #24 built the image with pmOS's stock 99990.7.2-r1 and published no
libcamera package at all. Copy it like libqmi/modemmanager (upstream aport
deleted first - duplicate pkgnames are a pmbootstrap hard error) and build
it explicitly so the -r2 apk reaches the registry publish step.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Jorijn van der Graaf 2026-08-16 16:56:04 +02:00
commit 0a50cad153
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build.sh
View file

@ -95,6 +95,7 @@ fi' EXIT
clone_retry "$WORK/pmaports" -q --depth=1 "$PMAPORTS_REPO" clone_retry "$WORK/pmaports" -q --depth=1 "$PMAPORTS_REPO"
rm -rf "$WORK/pmaports/device/testing/linux-postmarketos-qcom-milos" \ rm -rf "$WORK/pmaports/device/testing/linux-postmarketos-qcom-milos" \
"$WORK/pmaports/main/postmarketos-config-nftables" \ "$WORK/pmaports/main/postmarketos-config-nftables" \
"$WORK/pmaports/temp/libcamera" \
"$WORK/pmaports/temp/libqmi" \ "$WORK/pmaports/temp/libqmi" \
"$WORK/pmaports/temp/modemmanager" "$WORK/pmaports/temp/modemmanager"
mkdir -p "$WORK/pmaports/temp" mkdir -p "$WORK/pmaports/temp"
@ -109,6 +110,9 @@ cp -r aports/modem/imsd "$WORK/pmaports/modem/"
# draft) - deps of modemmanager/imsd, built from aports because r100 > repo. # draft) - deps of modemmanager/imsd, built from aports because r100 > repo.
cp -r aports/temp/libqmi "$WORK/pmaports/temp/" cp -r aports/temp/libqmi "$WORK/pmaports/temp/"
cp -r aports/temp/modemmanager "$WORK/pmaports/temp/" cp -r aports/temp/modemmanager "$WORK/pmaports/temp/"
# pmOS libcamera fork + the FP6 OV13B10 sensor-helper/properties patches
# (r2 > pmOS r1)
cp -r aports/temp/libcamera "$WORK/pmaports/temp/"
# --- 2. pin the kernel source ------------------------------------------------- # --- 2. pin the kernel source -------------------------------------------------
# Source archives are disabled on the Forgejo instance, so generate the # Source archives are disabled on the Forgejo instance, so generate the
@ -167,6 +171,10 @@ pmbootstrap checksum modemmanager
# the package is already current. # the package is already current.
pmbootstrap build --arch aarch64 libqmi pmbootstrap build --arch aarch64 libqmi
pmbootstrap build --arch aarch64 modemmanager pmbootstrap build --arch aarch64 modemmanager
# libcamera is no makedepend of anything here - build it explicitly so the
# patched -r2 exists for the publish step even if the install set resolves
# it before the overlay is considered.
pmbootstrap build --arch aarch64 libcamera
# --- 4. build the image ------------------------------------------------------- # --- 4. build the image -------------------------------------------------------
# Same default credentials as the official postmarketOS images. # Same default credentials as the official postmarketOS images.