diff --git a/device/rockchip/orangepi5/mkosi.conf b/device/rockchip/orangepi5/mkosi.conf index f37fc8b..6ee15f8 100644 --- a/device/rockchip/orangepi5/mkosi.conf +++ b/device/rockchip/orangepi5/mkosi.conf @@ -14,7 +14,8 @@ BuildSources=./:mkosi ./mkosi.images/u-boot/configuration:configuration [Output] -Format=directory +#Format=directory +Format=disk CompressOutput= # nand u-boot does not support # 4k sectors @@ -24,16 +25,22 @@ SectorSize=512 [Content] Packages= coreutils + passwd kernel-6.1-orangepi dnf dracut iproute2 locales-en openssh-server + xauth rosa-repos rosa-repos-contrib systemd + task-x11 + gstreamer1.0-plugins-good + gstreamer1.0-plugins-bad uboot-tools + camera_engine_rkaiq Bootable=no Autologin=yes @@ -44,4 +51,4 @@ Timezone=Europe/Moscow Hostname=orangepi5 WithDocs=no CleanPackageMetadata=false -WithRecommends=no +WithRecommends=yes diff --git a/device/rockchip/orangepi5/mkosi.extra/boot/bootenv.txt b/device/rockchip/orangepi5/mkosi.extra/boot/bootenv.txt index 2535be7..6cc9832 100644 --- a/device/rockchip/orangepi5/mkosi.extra/boot/bootenv.txt +++ b/device/rockchip/orangepi5/mkosi.extra/boot/bootenv.txt @@ -3,7 +3,7 @@ console=both extraargs=cma=256M overlay_prefix=rk3588 overlays=ov13850-c2 -fdtfile=dtbs/rockchip/rk3588s-orangepi-5.dtb +fdtfile=dtbs/rockchip/rk3588s-orangepi-5b.dtb rootdev=LABEL=rootfs rootfstype=ext4 usbstoragequirks=0x2537:0x1066:u,0x2537:0x1068:u diff --git a/device/rockchip/orangepi5/mkosi.extra/usr/lib/systemd/system-preset/10-ornagepi.preset b/device/rockchip/orangepi5/mkosi.extra/usr/lib/systemd/system-preset/10-ornagepi.preset index 18f0c33..eeda2bc 100644 --- a/device/rockchip/orangepi5/mkosi.extra/usr/lib/systemd/system-preset/10-ornagepi.preset +++ b/device/rockchip/orangepi5/mkosi.extra/usr/lib/systemd/system-preset/10-ornagepi.preset @@ -5,3 +5,4 @@ enable systemd-growfs-root.service # We install dnf in some images but it's only going to be used rarely, # so let's not have dnf create its cache. disable dnf-makecache.* +enable rkaiq_3A.service diff --git a/device/rockchip/orangepi5/mkosi.postoutput.d/10-dd-loader.sh b/device/rockchip/orangepi5/mkosi.postoutput.d/10-dd-loader.sh index 92aed0b..4a56de0 100755 --- a/device/rockchip/orangepi5/mkosi.postoutput.d/10-dd-loader.sh +++ b/device/rockchip/orangepi5/mkosi.postoutput.d/10-dd-loader.sh @@ -26,3 +26,6 @@ #dd if=${UBOOT_DIR}/idbloader.img of=${IMAGE} seek=64 conv=notrunc #dd if=${UBOOT_DIR}/u-boot.itb of=${IMAGE} seek=16384 conv=notrunc #popd +#echo "nameserver 8.8.8.8" > /etc/resolv.conf +#dnf in -y camera_engine_rkaiq +#systemctl enable rkaiq_3A.service diff --git a/device/rockchip/orangepi5/mkosi.repart/00-uboot.conf b/device/rockchip/orangepi5/mkosi.repart/00-uboot.conf index 1bdcd9f..47c84ec 100644 --- a/device/rockchip/orangepi5/mkosi.repart/00-uboot.conf +++ b/device/rockchip/orangepi5/mkosi.repart/00-uboot.conf @@ -1,5 +1,5 @@ [Partition] -Type=21686148-6449-6e6f-744e-656564454649 -Format= +Type=esp +Format=vfat SizeMinBytes=15M SizeMaxBytes=15M