Skip to content

Commit

Permalink
why cant i get into desktop env
Browse files Browse the repository at this point in the history
  • Loading branch information
xaqbr committed Sep 22, 2024
1 parent 7d745b9 commit e4537b6
Show file tree
Hide file tree
Showing 17 changed files with 239 additions and 4 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ ubuntu-*-cloudimg-console.log
/.tmp/
/output/
/cache/
/*userpatches*/
/userpatches

### General annoyances ###
.DS_Store
Expand Down
47 changes: 45 additions & 2 deletions config/bootscripts/boot-rk3588-legacy.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,38 @@ fi
# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi

setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
# Rauc bootloader configuration
test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi
setenv bootargs
echo "Boot order: ${BOOT_ORDER}"
echo "Boot A left: ${BOOT_A_LEFT} -- Boot B left: ${BOOT_B_LEFT}"
for BOOT_SLOT in "${BOOT_ORDER}"; do
echo "Checking slot ${BOOT_SLOT}..."
if test "x${bootargs}" != "x"; then
echo "Skipping slot ${BOOT_SLOT}..."
# skip remaining slots (?)
elif test "x${BOOT_SLOT}" = "xA"; then
echo "Checking slot A boot left..."
if test ${BOOT_A_LEFT} -gt 0; then
echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
setexpr BOOT_A_LEFT gsub "0x" ""
setenv bootargs "root=/dev/mmcblk1p2 rauc.slot=A rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
fi
elif test "x${BOOT_SLOT}" = "xB"; then
echo "Checking slot B boot left..."
if test ${BOOT_B_LEFT} -gt 0; then
echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
setexpr BOOT_B_LEFT gsub "0x" ""
setenv bootargs "root=/dev/mmcblk1p3 rauc.slot=B rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
fi
fi
done
echo "Finished checking slots"

load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image
Expand Down Expand Up @@ -81,6 +110,20 @@ else
fi
fi

# Rauc environment saving
if test -n "${bootargs}"; then
echo "Saving environment..."
saveenv
else
echo "No valid slot found, resetting tries to 3..."
setenv BOOT_A_LEFT 3
setenv BOOT_B_LEFT 3
saveenv
reset
fi

if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi

echo "Trying 'kaslrseed' command... Info: 'Unknown command' can be safely ignored since 'kaslrseed' does not apply to all boards."
kaslrseed # @TODO: This gives an error (Unknown command ' kaslrseed ' - try 'help') on many devices since CONFIG_CMD_KASLRSEED is not enabled
booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,3 +252,8 @@ CONFIG_SCSI=y
CONFIG_MTD_BLK_U_BOOT_OFFS=0x400
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
CONFIG_ENV_IS_IN_FAT=y
CONFIG_ENV_FAT_INTERFACE="mmc"
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_ENV_FAT_FILE="uboot.env"
CONFIG_FAT_WRITE=y
Original file line number Diff line number Diff line change
Expand Up @@ -252,3 +252,8 @@ CONFIG_SCSI=y
CONFIG_MTD_BLK_U_BOOT_OFFS=0x400
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
CONFIG_ENV_IS_IN_FAT=y
CONFIG_ENV_FAT_INTERFACE="mmc"
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_ENV_FAT_FILE="uboot.env"
CONFIG_FAT_WRITE=y
Original file line number Diff line number Diff line change
Expand Up @@ -252,3 +252,8 @@ CONFIG_SCSI=y
CONFIG_MTD_BLK_U_BOOT_OFFS=0x400
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
CONFIG_ENV_IS_IN_FAT=y
CONFIG_ENV_FAT_INTERFACE="mmc"
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_ENV_FAT_FILE="uboot.env"
CONFIG_FAT_WRITE=y
29 changes: 29 additions & 0 deletions userpatches/customize-image.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/bin/bash

RELEASE=$1
LINUXFAMILY=$2
BOARD=$3
BUILD_DESKTOP=$4

Main() {
# Set product hostname.
echo "dmbpro" > /etc/hostname

# Update and install necessary packages.
apt-get update -y
apt-get install -y systemd-repart libubootenv-tool chromium-browser vim rauc

# Copy overlay files.
cp -r /tmp/overlay/rootfs/* /
cp /tmp/overlay/cert.pem /etc/rauc

# Enable system services.
systemctl enable ssh

# Setup WiFi/Bluetooth drivers for Orange Pi 5B. At this time, Armbian
# doesn't support the board natively, so must configure this manually.
echo "overlays=orangepi-5-ap6275p" >> /boot/armbianEnv.txt
sed -i '/fdtfile/c fdtfile=rockchip/rk3588s-orangepi-5b.dtb' /boot/armbianEnv.txt # Set Orange Pi 5B device tree
}

Main "$@"
2 changes: 2 additions & 0 deletions userpatches/lib.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BOOTFS_TYPE="fat"
INCLUDE_HOME_DIR="yes"
35 changes: 35 additions & 0 deletions userpatches/overlay/cert.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
-----BEGIN CERTIFICATE-----
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
WZuNP6+a6761F8GgiA==
-----END CERTIFICATE-----
1 change: 1 addition & 0 deletions userpatches/overlay/rootfs/etc/fw_env.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/boot/uboot.env 0x0 0x8000
16 changes: 16 additions & 0 deletions userpatches/overlay/rootfs/etc/rauc/system.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[system]
compatible=DMB Pro Orange Pi 5B
bootloader=uboot

[keyring]
path=/etc/rauc/cert.pem

[slot.rootfs.0]
device=/dev/mmcblk1p2
type=ext4
bootname=A

[slot.rootfs.1]
device=/dev/mmcblk1p3
type=ext4
bootname=B
5 changes: 5 additions & 0 deletions userpatches/overlay/rootfs/etc/repart.d/50-dmbp-root.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Partition]
Type=linux-generic
Label=dmbp-root-a
SizeMinBytes=16G
SizeMaxBytes=16G
6 changes: 6 additions & 0 deletions userpatches/overlay/rootfs/etc/repart.d/60-dmbp-root-b.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[Partition]
Type=linux-generic
Label=dmbp-root-b
Format=ext4
SizeMinBytes=16G
SizeMaxBytes=16G
5 changes: 5 additions & 0 deletions userpatches/overlay/rootfs/etc/repart.d/70-dmbp-media.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Partition]
Type=linux-generic
Label=dmbp-media
Format=vfat
SizeMinBytes=2G
3 changes: 3 additions & 0 deletions userpatches/overlay/rootfs/etc/udisks2/mount_options.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Default]
defaults=gid=33,uid=33
allow=gid=33,uid=33
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
[Plymouth Theme]
Name=Armbian
Description=Armbian logo
ModuleName=two-step

[two-step]
Font=DejaVu Sans 15
TitleFont=DejaVu Sans Mono Bold 30
ImageDir=/usr/share/plymouth/themes/armbian
DialogHorizontalAlignment=.5
DialogVerticalAlignment=.7
TitleHorizontalAlignment=.5
TitleVerticalAlignment=.382
HorizontalAlignment=.6
VerticalAlignment=.5
WatermarkHorizontalAlignment=.5
WatermarkVerticalAlignment=.5
Transition=none
TransitionDuration=0.0
BackgroundStartColor=0x000000
BackgroundEndColor=0x000000
ProgressBarBackgroundColor=0x606060
ProgressBarForegroundColor=0xffffff
DialogClearsFirmwareBackground=false
MessageBelowAnimation=true

[boot-up]
UseEndAnimation=false
UseFirmwareBackground=false

[shutdown]
UseEndAnimation=false
UseFirmwareBackground=false

[reboot]
UseEndAnimation=false
UseFirmwareBackground=false

[updates]
SuppressMessages=true
ProgressBarShowPercentComplete=true
UseProgressBar=true
Title=Installing Updates...
_Title=Installing Updates...
SubTitle=Do not turn off your computer
_SubTitle=Do not turn off your computer

[system-upgrade]
SuppressMessages=true
ProgressBarShowPercentComplete=true
UseProgressBar=true
Title=Upgrading System...
_Title=Upgrading System...
SubTitle=Do not turn off your computer
_SubTitle=Do not turn off your computer

[firmware-upgrade]
SuppressMessages=true
ProgressBarShowPercentComplete=true
UseProgressBar=true
Title=Upgrading Firmware...
_Title=Upgrading Firmware...
SubTitle=Do not turn off your computer
_SubTitle=Do not turn off your computer
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions userpatches/u-boot/v2024.01/board_orangepi5/0015-persist-env.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/configs/orangepi_5_defconfig b/configs/orangepi_5_defconfig
index 2e289992b..c4f76ddec 100644
--- a/configs/orangepi_5_defconfig
+++ b/configs/orangepi_5_defconfig
@@ -254,3 +254,8 @@ CONFIG_SCSI_AHCI=y
CONFIG_SCSI=y
CONFIG_USING_KERNEL_DTB_V2=y
CONFIG_MTD_BLK_U_BOOT_OFFS=0x400
+CONFIG_ENV_IS_IN_FAT=y
+CONFIG_ENV_FAT_INTERFACE="mmc"
+CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
+CONFIG_ENV_FAT_FILE="uboot.env"
+CONFIG_FAT_WRITE=y

0 comments on commit e4537b6

Please sign in to comment.