From de97c74ae504be446a73546f608a71f617e10ae1 Mon Sep 17 00:00:00 2001 From: Lane Jennison Date: Mon, 20 Jan 2025 19:15:46 -0500 Subject: [PATCH 1/8] disable ccache in a friendly way --- lib/functions/configuration/compilation-config.sh | 4 +++- lib/functions/configuration/main-config.sh | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/functions/configuration/compilation-config.sh b/lib/functions/configuration/compilation-config.sh index 99cfb71029b6..8b416d0e547a 100644 --- a/lib/functions/configuration/compilation-config.sh +++ b/lib/functions/configuration/compilation-config.sh @@ -9,7 +9,9 @@ function prepare_compilation_vars() { # moved from config: rpardini: ccache belongs in compilation, not config. I think. - if [[ $USE_CCACHE != no ]]; then + if [[ $USE_CCACHE == yes || ${PRIVATE_CCACHE} == yes ]]; then + display_alert "using CCACHE" "USE_CCACHE or PRIVATE_CCACHE is set to yes" "warn" + CCACHE=ccache export PATH="/usr/lib/ccache:$PATH" # this actually needs export'ing # private ccache directory to avoid permission issues when using build script with "sudo" diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index a2c5878fa996..498caa28f638 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -60,6 +60,7 @@ function do_main_configuration() { display_alert "DEST_LANG..." "DEST_LANG: ${DEST_LANG}" "debug" declare -g SKIP_EXTERNAL_TOOLCHAINS="${SKIP_EXTERNAL_TOOLCHAINS:-yes}" # don't use any external toolchains, by default. + declare -g USE_CCACHE="${USE_CCACHE:-no}" # stop using ccache as our worktree is more effective # Armbian config is central tool used in all builds. As its build externally, we have moved it to extension. Enable it here. enable_extension "armbian-config" From 9e455733bd559a58a5051715ac1f8ca9845df276 Mon Sep 17 00:00:00 2001 From: jpy794 Date: Thu, 23 Jan 2025 17:01:45 +0800 Subject: [PATCH 2/8] fix native ethernet on nanopi-r4se standard edition without EEPROM --- patch/kernel/archive/rockchip64-6.12/dt/rk3399-nanopi-r4se.dts | 2 +- patch/kernel/archive/rockchip64-6.13/dt/rk3399-nanopi-r4se.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patch/kernel/archive/rockchip64-6.12/dt/rk3399-nanopi-r4se.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-nanopi-r4se.dts index 1c9d0c34f151..eaeeadce5d23 100644 --- a/patch/kernel/archive/rockchip64-6.12/dt/rk3399-nanopi-r4se.dts +++ b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-nanopi-r4se.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /dts-v1/; -#include "rk3399-nanopi-r4s-enterprise.dts" +#include "rk3399-nanopi-r4s.dts" / { model = "FriendlyElec NanoPi R4SE"; diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3399-nanopi-r4se.dts b/patch/kernel/archive/rockchip64-6.13/dt/rk3399-nanopi-r4se.dts index 1c9d0c34f151..eaeeadce5d23 100644 --- a/patch/kernel/archive/rockchip64-6.13/dt/rk3399-nanopi-r4se.dts +++ b/patch/kernel/archive/rockchip64-6.13/dt/rk3399-nanopi-r4se.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /dts-v1/; -#include "rk3399-nanopi-r4s-enterprise.dts" +#include "rk3399-nanopi-r4s.dts" / { model = "FriendlyElec NanoPi R4SE"; From 1477b478c5bc73f1b9e6beb2ba3b9051128d1eb8 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 23 Jan 2025 09:38:33 +0100 Subject: [PATCH 3/8] Add upstream release as csc target: Ubuntu plucky 25.04 --- config/cli/plucky | 1 + config/desktop/plucky | 1 + config/distributions/oracular/support | 2 +- config/distributions/plucky/architectures | 1 + config/distributions/plucky/name | 1 + config/distributions/plucky/order | 1 + config/distributions/plucky/support | 1 + config/distributions/plucky/upgrade | 1 + lib/functions/configuration/main-config.sh | 2 +- lib/functions/rootfs/distro-specific.sh | 4 ++-- 10 files changed, 11 insertions(+), 4 deletions(-) create mode 120000 config/cli/plucky create mode 120000 config/desktop/plucky create mode 100644 config/distributions/plucky/architectures create mode 100644 config/distributions/plucky/name create mode 100644 config/distributions/plucky/order create mode 100644 config/distributions/plucky/support create mode 100644 config/distributions/plucky/upgrade diff --git a/config/cli/plucky b/config/cli/plucky new file mode 120000 index 000000000000..c44ffafd2e46 --- /dev/null +++ b/config/cli/plucky @@ -0,0 +1 @@ +noble \ No newline at end of file diff --git a/config/desktop/plucky b/config/desktop/plucky new file mode 120000 index 000000000000..c44ffafd2e46 --- /dev/null +++ b/config/desktop/plucky @@ -0,0 +1 @@ +noble \ No newline at end of file diff --git a/config/distributions/oracular/support b/config/distributions/oracular/support index 03cd47015043..bc2264ca197d 100644 --- a/config/distributions/oracular/support +++ b/config/distributions/oracular/support @@ -1 +1 @@ -csc +eos diff --git a/config/distributions/plucky/architectures b/config/distributions/plucky/architectures new file mode 100644 index 000000000000..6103381d1881 --- /dev/null +++ b/config/distributions/plucky/architectures @@ -0,0 +1 @@ +arm64,armhf,riscv64,amd64 diff --git a/config/distributions/plucky/name b/config/distributions/plucky/name new file mode 100644 index 000000000000..01514921cb01 --- /dev/null +++ b/config/distributions/plucky/name @@ -0,0 +1 @@ +Ubuntu plucky 25.04 diff --git a/config/distributions/plucky/order b/config/distributions/plucky/order new file mode 100644 index 000000000000..45a4fb75db86 --- /dev/null +++ b/config/distributions/plucky/order @@ -0,0 +1 @@ +8 diff --git a/config/distributions/plucky/support b/config/distributions/plucky/support new file mode 100644 index 000000000000..03cd47015043 --- /dev/null +++ b/config/distributions/plucky/support @@ -0,0 +1 @@ +csc diff --git a/config/distributions/plucky/upgrade b/config/distributions/plucky/upgrade new file mode 100644 index 000000000000..621e94f0ec95 --- /dev/null +++ b/config/distributions/plucky/upgrade @@ -0,0 +1 @@ +none diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index 498caa28f638..3ebea21a048b 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -361,7 +361,7 @@ function do_extra_configuration() { [[ -z $BOOTPATCHDIR ]] && BOOTPATCHDIR="u-boot-$LINUXFAMILY" # @TODO move to hook [[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY" - if [[ "$RELEASE" =~ ^(focal|jammy|noble|oracular)$ ]]; then + if [[ "$RELEASE" =~ ^(focal|jammy|noble|oracular|plucky)$ ]]; then DISTRIBUTION="Ubuntu" else DISTRIBUTION="Debian" diff --git a/lib/functions/rootfs/distro-specific.sh b/lib/functions/rootfs/distro-specific.sh index db40363be3ff..010ff4b3c907 100644 --- a/lib/functions/rootfs/distro-specific.sh +++ b/lib/functions/rootfs/distro-specific.sh @@ -69,7 +69,7 @@ function install_distribution_specific() { # create_sources_list_and_deploy_repo_key # # : rootfs|image -# : bullseye|bookworm|sid|focal|jammy|noble|oracular +# : bullseye|bookworm|sid|focal|jammy|noble|oracular|plucky # : path to root directory # function create_sources_list_and_deploy_repo_key() { @@ -139,7 +139,7 @@ function create_sources_list_and_deploy_repo_key() { fi ;; - focal | jammy | noble | oracular) + focal | jammy | noble | oracular | plucky) cat <<- EOF > "${basedir}"/etc/apt/sources.list deb http://${UBUNTU_MIRROR} $release main restricted universe multiverse #deb-src http://${UBUNTU_MIRROR} $release main restricted universe multiverse From b349229716e83e83df95b0027a2562296acb3ffd Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 23 Jan 2025 23:28:40 +0100 Subject: [PATCH 4/8] Ubuntu Plucky: disable missing packages --- .../desktop/common/environments/cinnamon/config_base/packages | 2 +- config/desktop/common/environments/xfce/config_base/packages | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/desktop/common/environments/cinnamon/config_base/packages b/config/desktop/common/environments/cinnamon/config_base/packages index 2cf2f5d27d44..81181bc7690b 100644 --- a/config/desktop/common/environments/cinnamon/config_base/packages +++ b/config/desktop/common/environments/cinnamon/config_base/packages @@ -62,7 +62,7 @@ laptop-detect libatk-adaptor libcinnamon-desktop4 libcinnamon-menu-3-0 -libcscreensaver0 +#libcscreensaver0 libcvc0 libgl1-mesa-dri libgsettings-qt1 diff --git a/config/desktop/common/environments/xfce/config_base/packages b/config/desktop/common/environments/xfce/config_base/packages index c200b3366ab4..ff28ceab4be9 100644 --- a/config/desktop/common/environments/xfce/config_base/packages +++ b/config/desktop/common/environments/xfce/config_base/packages @@ -69,7 +69,7 @@ p7zip-full pamix pasystray pavucontrol -pavumeter +#pavumeter policykit-1 policykit-desktop-privileges printer-driver-all From 919ccfc2279dd2119ce9837742461bec525b9daf Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 8 Jan 2025 13:09:47 +0100 Subject: [PATCH 5/8] nanopi-r6s: u-boot: bump to 2025.01 final, with working UMS and SD -> NVMe -> eMMC boot order - also LEDs, networking, more supported compression methods... - copypasta reigns supreme. refactor is coming, just not today - also hack the u-boot dtsi for consistent-with-Linux-mainline-DT mmc/sd numbering - this was previously a separate patch in 2024.10 --- config/boards/nanopi-r6s.conf | 77 +++++++++++++++++-- ...0001-adjust-wrong-mmc0-mmc1-ordering.patch | 28 ------- 2 files changed, 70 insertions(+), 35 deletions(-) delete mode 100644 patch/u-boot/v2024.10/board_nanopi-r6s/0001-adjust-wrong-mmc0-mmc1-ordering.patch diff --git a/config/boards/nanopi-r6s.conf b/config/boards/nanopi-r6s.conf index bd61ccf65371..c8fde5a4e305 100644 --- a/config/boards/nanopi-r6s.conf +++ b/config/boards/nanopi-r6s.conf @@ -40,17 +40,80 @@ function post_family_config__nanopi_r6s_use_mainline_uboot() { declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot - declare -g BOOTBRANCH="tag:v2024.10" - declare -g BOOTPATCHDIR="v2024.10" - # Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency - + declare -g BOOTBRANCH="tag:v2025.01" + declare -g BOOTPATCHDIR="v2025.01" + declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin" - - # Disable stuff from rockchip64_common; we're using binman here which does all the work already - unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd + unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already # Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go function write_uboot_platform() { dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none } } + +function pre_config_uboot_target__r6s_patch_uboot_dtsi_for_ums() { + display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file + cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi + &u2phy0 { status = "okay"; }; + &u2phy0_otg { status = "okay"; }; + &usbdp_phy0 { status = "okay"; }; + &usb_host0_xhci { dr_mode = "peripheral"; maximum-speed = "high-speed"; status = "okay"; }; + EOD +} + +# The upstream DTs (kernel 6.13 / u-boot 2025.01) are in flux and different +# let's just patch to normalize the SD and eMMC order as in mainline Linux DT: https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi#L14-L15 +function pre_config_uboot_target__r6s_patch_uboot_dtsi_for_sd_emmc_order() { + display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for SD=mmc0 and eMMC=mmc1" "info" + cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi + / { aliases { mmc0 = &sdmmc; mmc1 = &sdhci; }; }; + EOD +} + +# "rockchip-common: boot SD card first, then NVMe, then mmc" +# include/configs/rockchip-common.h +# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi" +# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi" +# On R6S, mmc1 is the eMMC, mmc0 is the SD card slot +function pre_config_uboot_target__r6s_patch_rockchip_common_boot_order() { + declare -a rockchip_uboot_targets=("mmc0" "nvme" "mmc1" "scsi" "usb" "pxe" "dhcp" "spi") # for future make-this-generic delight + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info" + sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h + regular_git diff -u include/configs/rockchip-common.h || true +} + +function post_config_uboot_target__extra_configs_for_r6s_mainline() { + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable board-specific configs" "info" + run_host_command_logged scripts/config --enable CONFIG_DM_PMIC_FAN53555 + run_host_command_logged scripts/config --enable CONFIG_CMD_MISC + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "info" + run_host_command_logged scripts/config --enable CMD_EFIDEBUG + run_host_command_logged scripts/config --enable CMD_NVEDIT_EFI + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable more compression support" "info" + run_host_command_logged scripts/config --enable CONFIG_LZO + run_host_command_logged scripts/config --enable CONFIG_BZIP2 + run_host_command_logged scripts/config --enable CONFIG_ZSTD + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable gpio LED support" "info" + run_host_command_logged scripts/config --enable CONFIG_LED + run_host_command_logged scripts/config --enable CONFIG_LED_GPIO + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable networking cmds" "info" + run_host_command_logged scripts/config --enable CONFIG_CMD_NFS + run_host_command_logged scripts/config --enable CONFIG_CMD_WGET + run_host_command_logged scripts/config --enable CONFIG_CMD_DNS + run_host_command_logged scripts/config --enable CONFIG_PROT_TCP + run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK + + # UMS, RockUSB, gadget stuff + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "info" + declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB" "CONFIG_CMD_USB_MASS_STORAGE") + for config in "${enable_configs[@]}"; do + run_host_command_logged scripts/config --enable "${config}" + done + # Auto-enabled by the above, force off... + run_host_command_logged scripts/config --disable USB_FUNCTION_FASTBOOT +} diff --git a/patch/u-boot/v2024.10/board_nanopi-r6s/0001-adjust-wrong-mmc0-mmc1-ordering.patch b/patch/u-boot/v2024.10/board_nanopi-r6s/0001-adjust-wrong-mmc0-mmc1-ordering.patch deleted file mode 100644 index 6b9e674c3c16..000000000000 --- a/patch/u-boot/v2024.10/board_nanopi-r6s/0001-adjust-wrong-mmc0-mmc1-ordering.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Muhammed Efe Cetin -Date: Sat, 30 Nov 2024 02:09:36 +0300 -Subject: adjust wrong mmc0/mmc1 ordering - ---- - arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi b/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi -+++ b/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi -@@ -1,3 +1,10 @@ - // SPDX-License-Identifier: (GPL-2.0+ OR MIT) - - #include "rk3588s-u-boot.dtsi" -+ -+/ { -+ aliases { -+ mmc0 = &sdhci; -+ mmc1 = &sdmmc; -+ }; -+}; -\ No newline at end of file --- -Armbian - From 7951c045e6bd87f1cc8c8e5f11fb8ec18456548a Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 8 Jan 2025 13:07:52 +0100 Subject: [PATCH 6/8] nanopi-r6c: enable usage with `EXT=uefi-edk2-rk3588` --- config/boards/nanopi-r6c.csc | 1 + 1 file changed, 1 insertion(+) diff --git a/config/boards/nanopi-r6c.csc b/config/boards/nanopi-r6c.csc index b91245ca3d4c..aca43a5b85ec 100644 --- a/config/boards/nanopi-r6c.csc +++ b/config/boards/nanopi-r6c.csc @@ -10,6 +10,7 @@ BOOT_LOGO="desktop" IMAGE_PARTITION_TABLE="gpt" BOOT_FDT_FILE="rockchip/rk3588s-nanopi-r6c.dtb" BOOT_SCENARIO="spl-blobs" +declare -g UEFI_EDK2_BOARD_ID="nanopi-r6c" # This _only_ used for uefi-edk2-rk3588 extension function post_family_tweaks__nanopi_r6c_naming_audios() { display_alert "$BOARD" "Renaming NanoPi R6C HDMI audio interface to human-readable form" "info" From f3726b6701e1e2ebe68661a34209262a9eed516f Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 8 Jan 2025 13:09:31 +0100 Subject: [PATCH 7/8] nanopi-r6c: u-boot: bump to 2025.01 final, with working UMS and SD -> NVMe -> eMMC boot order - also LEDs, networking, more supported compression methods... - copypasta reigns supreme. refactor is coming, just not today - also hack the u-boot dtsi for consistent-with-Linux-mainline-DT mmc/sd numbering --- config/boards/nanopi-r6c.csc | 77 ++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 7 deletions(-) diff --git a/config/boards/nanopi-r6c.csc b/config/boards/nanopi-r6c.csc index aca43a5b85ec..3be3d7e36ee7 100644 --- a/config/boards/nanopi-r6c.csc +++ b/config/boards/nanopi-r6c.csc @@ -37,17 +37,80 @@ function post_family_config__nanopi_r6c_use_mainline_uboot() { declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot - declare -g BOOTBRANCH="tag:v2024.10" - declare -g BOOTPATCHDIR="v2024.10" - # Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency - + declare -g BOOTBRANCH="tag:v2025.01" + declare -g BOOTPATCHDIR="v2025.01" + declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin" - - # Disable stuff from rockchip64_common; we're using binman here which does all the work already - unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd + unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already # Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go function write_uboot_platform() { dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none } } + +function pre_config_uboot_target__r6c_patch_uboot_dtsi_for_ums() { + display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file + cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi + &u2phy0 { status = "okay"; }; + &u2phy0_otg { status = "okay"; }; + &usbdp_phy0 { status = "okay"; }; + &usb_host0_xhci { dr_mode = "peripheral"; maximum-speed = "high-speed"; status = "okay"; }; + EOD +} + +# The upstream DTs (kernel 6.13 / u-boot 2025.01) are in flux and different +# let's just patch to normalize the SD and eMMC order as in mainline Linux DT: https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi#L14-L15 +function pre_config_uboot_target__r6c_patch_uboot_dtsi_for_sd_emmc_order() { + display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for SD=mmc0 and eMMC=mmc1" "info" + cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi + / { aliases { mmc0 = &sdmmc; mmc1 = &sdhci; }; }; + EOD +} + +# "rockchip-common: boot SD card first, then NVMe, then mmc" +# include/configs/rockchip-common.h +# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi" +# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi" +# On R6C, mmc1 is the eMMC, mmc0 is the SD card slot +function pre_config_uboot_target__r6c_patch_rockchip_common_boot_order() { + declare -a rockchip_uboot_targets=("mmc0" "nvme" "mmc1" "scsi" "usb" "pxe" "dhcp" "spi") # for future make-this-generic delight + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info" + sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h + regular_git diff -u include/configs/rockchip-common.h || true +} + +function post_config_uboot_target__extra_configs_for_r6c_mainline() { + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable board-specific configs" "info" + run_host_command_logged scripts/config --enable CONFIG_DM_PMIC_FAN53555 + run_host_command_logged scripts/config --enable CONFIG_CMD_MISC + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "info" + run_host_command_logged scripts/config --enable CMD_EFIDEBUG + run_host_command_logged scripts/config --enable CMD_NVEDIT_EFI + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable more compression support" "info" + run_host_command_logged scripts/config --enable CONFIG_LZO + run_host_command_logged scripts/config --enable CONFIG_BZIP2 + run_host_command_logged scripts/config --enable CONFIG_ZSTD + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable gpio LED support" "info" + run_host_command_logged scripts/config --enable CONFIG_LED + run_host_command_logged scripts/config --enable CONFIG_LED_GPIO + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable networking cmds" "info" + run_host_command_logged scripts/config --enable CONFIG_CMD_NFS + run_host_command_logged scripts/config --enable CONFIG_CMD_WGET + run_host_command_logged scripts/config --enable CONFIG_CMD_DNS + run_host_command_logged scripts/config --enable CONFIG_PROT_TCP + run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK + + # UMS, RockUSB, gadget stuff + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "info" + declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB" "CONFIG_CMD_USB_MASS_STORAGE") + for config in "${enable_configs[@]}"; do + run_host_command_logged scripts/config --enable "${config}" + done + # Auto-enabled by the above, force off... + run_host_command_logged scripts/config --disable USB_FUNCTION_FASTBOOT +} From 9e48c3993ca942b53a2da4e90d5ca36f1afe9aea Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 24 Jan 2025 07:18:10 +0100 Subject: [PATCH 8/8] Ubuntu Plucky: fixing remaining problems - detach from Noble, revert Noble changes --- .../cinnamon/config_base/packages | 3 +- .../environments/xfce/config_base/packages | 2 +- .../kde-plasma/config_base/packages | 1 - config/desktop/plucky | 1 - .../armbian/create_desktop_package.sh | 4 + .../plucky/appgroups/browsers/debian/postinst | 14 ++ .../plucky/appgroups/browsers/packages | 2 + config/desktop/plucky/appgroups/chat/packages | 4 + .../plucky/appgroups/desktop_tools/packages | 2 + .../desktop/plucky/appgroups/editors/packages | 1 + .../desktop/plucky/appgroups/email/packages | 0 .../plucky/appgroups/internet/packages | 4 + .../plucky/appgroups/multimedia/packages | 5 + .../desktop/plucky/appgroups/office/packages | 4 + .../custom/desktops/cinnamon/packages | 2 + .../custom/desktops/gnome/packages | 1 + .../programming/custom/desktops/kde/packages | 2 + .../plucky/appgroups/programming/packages | 4 + .../plucky/appgroups/remote_desktop/packages | 3 + .../environments/cinnamon/architectures | 1 + .../armbian/create_desktop_package.sh | 164 ++++++++++++++++++ .../cinnamon/config_base/packages | 128 ++++++++++++++ .../cinnamon/config_base/packages.uninstall | 2 + .../environments/cinnamon/debian/postinst | 134 ++++++++++++++ .../plucky/environments/cinnamon/support | 1 + config/desktop/plucky/environments/gnome | 1 + .../plucky/environments/i3-wm/architectures | 1 + .../i3-wm/armbian/create_desktop_package.sh | 14 ++ .../environments/i3-wm/config_base/packages | 146 ++++++++++++++++ .../plucky/environments/i3-wm/debian/postinst | 41 +++++ .../desktop/plucky/environments/i3-wm/support | 1 + .../environments/kde-neon/architectures | 1 + .../plucky/environments/kde-neon/armbian | 1 + .../kde-neon/config_base/packages | 10 ++ .../kde-neon/config_base/packages.uninstall | 1 + .../plucky/environments/kde-neon/debian | 1 + .../kde-neon/sources/apt/neon.gpg | Bin 0 -> 1108 bytes .../kde-neon/sources/apt/neon.source | 1 + .../plucky/environments/kde-neon/support | 1 + config/desktop/plucky/environments/kde-plasma | 1 + .../plucky/environments/xfce/appgroups | 1 + .../plucky/environments/xfce/architectures | 1 + .../desktop/plucky/environments/xfce/armbian | 1 + .../environments/xfce/config_base/packages | 121 +++++++++++++ .../xfce/config_base/packages.uninstall | 1 + .../desktop/plucky/environments/xfce/debian | 1 + .../desktop/plucky/environments/xfce/support | 1 + 47 files changed, 832 insertions(+), 5 deletions(-) delete mode 120000 config/desktop/plucky create mode 100644 config/desktop/plucky/appgroups/browsers/armbian/create_desktop_package.sh create mode 100644 config/desktop/plucky/appgroups/browsers/debian/postinst create mode 100644 config/desktop/plucky/appgroups/browsers/packages create mode 100644 config/desktop/plucky/appgroups/chat/packages create mode 100644 config/desktop/plucky/appgroups/desktop_tools/packages create mode 100644 config/desktop/plucky/appgroups/editors/packages create mode 100644 config/desktop/plucky/appgroups/email/packages create mode 100644 config/desktop/plucky/appgroups/internet/packages create mode 100644 config/desktop/plucky/appgroups/multimedia/packages create mode 100644 config/desktop/plucky/appgroups/office/packages create mode 100644 config/desktop/plucky/appgroups/programming/custom/desktops/cinnamon/packages create mode 100644 config/desktop/plucky/appgroups/programming/custom/desktops/gnome/packages create mode 100644 config/desktop/plucky/appgroups/programming/custom/desktops/kde/packages create mode 100644 config/desktop/plucky/appgroups/programming/packages create mode 100644 config/desktop/plucky/appgroups/remote_desktop/packages create mode 100644 config/desktop/plucky/environments/cinnamon/architectures create mode 100755 config/desktop/plucky/environments/cinnamon/armbian/create_desktop_package.sh create mode 100644 config/desktop/plucky/environments/cinnamon/config_base/packages create mode 100644 config/desktop/plucky/environments/cinnamon/config_base/packages.uninstall create mode 100755 config/desktop/plucky/environments/cinnamon/debian/postinst create mode 100644 config/desktop/plucky/environments/cinnamon/support create mode 120000 config/desktop/plucky/environments/gnome create mode 100644 config/desktop/plucky/environments/i3-wm/architectures create mode 100644 config/desktop/plucky/environments/i3-wm/armbian/create_desktop_package.sh create mode 100644 config/desktop/plucky/environments/i3-wm/config_base/packages create mode 100644 config/desktop/plucky/environments/i3-wm/debian/postinst create mode 100644 config/desktop/plucky/environments/i3-wm/support create mode 120000 config/desktop/plucky/environments/kde-neon/architectures create mode 120000 config/desktop/plucky/environments/kde-neon/armbian create mode 100644 config/desktop/plucky/environments/kde-neon/config_base/packages create mode 120000 config/desktop/plucky/environments/kde-neon/config_base/packages.uninstall create mode 120000 config/desktop/plucky/environments/kde-neon/debian create mode 100644 config/desktop/plucky/environments/kde-neon/sources/apt/neon.gpg create mode 100644 config/desktop/plucky/environments/kde-neon/sources/apt/neon.source create mode 100644 config/desktop/plucky/environments/kde-neon/support create mode 120000 config/desktop/plucky/environments/kde-plasma create mode 120000 config/desktop/plucky/environments/xfce/appgroups create mode 120000 config/desktop/plucky/environments/xfce/architectures create mode 120000 config/desktop/plucky/environments/xfce/armbian create mode 100644 config/desktop/plucky/environments/xfce/config_base/packages create mode 120000 config/desktop/plucky/environments/xfce/config_base/packages.uninstall create mode 120000 config/desktop/plucky/environments/xfce/debian create mode 120000 config/desktop/plucky/environments/xfce/support diff --git a/config/desktop/common/environments/cinnamon/config_base/packages b/config/desktop/common/environments/cinnamon/config_base/packages index 81181bc7690b..8e619d373f75 100644 --- a/config/desktop/common/environments/cinnamon/config_base/packages +++ b/config/desktop/common/environments/cinnamon/config_base/packages @@ -62,7 +62,7 @@ laptop-detect libatk-adaptor libcinnamon-desktop4 libcinnamon-menu-3-0 -#libcscreensaver0 +libcscreensaver0 libcvc0 libgl1-mesa-dri libgsettings-qt1 @@ -88,7 +88,6 @@ p7zip-full pamix pasystray pavucontrol -pavumeter policykit-1 policykit-desktop-privileges printer-driver-all diff --git a/config/desktop/common/environments/xfce/config_base/packages b/config/desktop/common/environments/xfce/config_base/packages index ff28ceab4be9..c200b3366ab4 100644 --- a/config/desktop/common/environments/xfce/config_base/packages +++ b/config/desktop/common/environments/xfce/config_base/packages @@ -69,7 +69,7 @@ p7zip-full pamix pasystray pavucontrol -#pavumeter +pavumeter policykit-1 policykit-desktop-privileges printer-driver-all diff --git a/config/desktop/jammy/environments/kde-plasma/config_base/packages b/config/desktop/jammy/environments/kde-plasma/config_base/packages index 3761ed403f90..356f8c3382bb 100644 --- a/config/desktop/jammy/environments/kde-plasma/config_base/packages +++ b/config/desktop/jammy/environments/kde-plasma/config_base/packages @@ -96,7 +96,6 @@ pamix pasystray pavucontrol pavucontrol-qt -pavumeter policykit-1 policykit-desktop-privileges printer-driver-all diff --git a/config/desktop/plucky b/config/desktop/plucky deleted file mode 120000 index c44ffafd2e46..000000000000 --- a/config/desktop/plucky +++ /dev/null @@ -1 +0,0 @@ -noble \ No newline at end of file diff --git a/config/desktop/plucky/appgroups/browsers/armbian/create_desktop_package.sh b/config/desktop/plucky/appgroups/browsers/armbian/create_desktop_package.sh new file mode 100644 index 000000000000..a1bc70a52915 --- /dev/null +++ b/config/desktop/plucky/appgroups/browsers/armbian/create_desktop_package.sh @@ -0,0 +1,4 @@ +# install optimized browser configurations +cp "${SRC}"/packages/blobs/desktop/chromium.conf "${destination}"/etc/armbian +cp "${SRC}"/packages/blobs/desktop/firefox.conf "${destination}"/etc/armbian +cp -R "${SRC}"/packages/blobs/desktop/chromium "${destination}"/etc/armbian diff --git a/config/desktop/plucky/appgroups/browsers/debian/postinst b/config/desktop/plucky/appgroups/browsers/debian/postinst new file mode 100644 index 000000000000..dff3ec1571d5 --- /dev/null +++ b/config/desktop/plucky/appgroups/browsers/debian/postinst @@ -0,0 +1,14 @@ +if [ -f /etc/chromium-browser/default ]; then +cat > /etc/chromium-browser/default << DELIM +# Options to pass to chromium-browser +CHROMIUM_FLAGS="--use-gl=egl --ignore-gpu-blocklist --enable-accelerated-video-decode --enable-zero-copy --enable-gpu-rasterization --enable-oop-rasterization --enable-pinch --flag-switches-begin --flag-switches-end --origin-trial-disabled-features=SecurePaymentConfirmation" +DELIM +fi + +# overwrite stock firefox configuration +if [ -d /etc/firefox/ ]; then ln -sf /etc/armbian/firefox.conf /etc/firefox/syspref.js; fi +if [ -d /usr/lib/firefox-esr/ ]; then + ln -sf /etc/armbian/firefox.conf /usr/lib/firefox-esr/mozilla.cfg + echo 'pref("general.config.obscure_value", 0);' > /usr/lib/firefox-esr/defaults/pref/local-settings.js + echo 'pref("general.config.filename", "mozilla.cfg");' >> /usr/lib/firefox-esr/defaults/pref/local-settings.js +fi diff --git a/config/desktop/plucky/appgroups/browsers/packages b/config/desktop/plucky/appgroups/browsers/packages new file mode 100644 index 000000000000..6821f1236d30 --- /dev/null +++ b/config/desktop/plucky/appgroups/browsers/packages @@ -0,0 +1,2 @@ +chromium-browser +firefox diff --git a/config/desktop/plucky/appgroups/chat/packages b/config/desktop/plucky/appgroups/chat/packages new file mode 100644 index 000000000000..197c98ab0798 --- /dev/null +++ b/config/desktop/plucky/appgroups/chat/packages @@ -0,0 +1,4 @@ +hexchat +#pidgin +#purple-discord +#purple-rocketchat diff --git a/config/desktop/plucky/appgroups/desktop_tools/packages b/config/desktop/plucky/appgroups/desktop_tools/packages new file mode 100644 index 000000000000..9accdd4971ba --- /dev/null +++ b/config/desktop/plucky/appgroups/desktop_tools/packages @@ -0,0 +1,2 @@ +bleachbit +gparted diff --git a/config/desktop/plucky/appgroups/editors/packages b/config/desktop/plucky/appgroups/editors/packages new file mode 100644 index 000000000000..e4be0f570e59 --- /dev/null +++ b/config/desktop/plucky/appgroups/editors/packages @@ -0,0 +1 @@ +emacs diff --git a/config/desktop/plucky/appgroups/email/packages b/config/desktop/plucky/appgroups/email/packages new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/config/desktop/plucky/appgroups/internet/packages b/config/desktop/plucky/appgroups/internet/packages new file mode 100644 index 000000000000..a2c5a9166cd5 --- /dev/null +++ b/config/desktop/plucky/appgroups/internet/packages @@ -0,0 +1,4 @@ +filezilla +putty +transmission +transmission-remote-gtk diff --git a/config/desktop/plucky/appgroups/multimedia/packages b/config/desktop/plucky/appgroups/multimedia/packages new file mode 100644 index 000000000000..b7d6f3555d8c --- /dev/null +++ b/config/desktop/plucky/appgroups/multimedia/packages @@ -0,0 +1,5 @@ +celluloid +eog +gimp +pithos +mpv diff --git a/config/desktop/plucky/appgroups/office/packages b/config/desktop/plucky/appgroups/office/packages new file mode 100644 index 000000000000..bb3cf63504ec --- /dev/null +++ b/config/desktop/plucky/appgroups/office/packages @@ -0,0 +1,4 @@ +libreoffice +libreoffice-gtk3 +libreoffice-style-elementary +simple-scan diff --git a/config/desktop/plucky/appgroups/programming/custom/desktops/cinnamon/packages b/config/desktop/plucky/appgroups/programming/custom/desktops/cinnamon/packages new file mode 100644 index 000000000000..35db926ee88c --- /dev/null +++ b/config/desktop/plucky/appgroups/programming/custom/desktops/cinnamon/packages @@ -0,0 +1,2 @@ +gnome-builder +sysprof diff --git a/config/desktop/plucky/appgroups/programming/custom/desktops/gnome/packages b/config/desktop/plucky/appgroups/programming/custom/desktops/gnome/packages new file mode 100644 index 000000000000..8194ef7e5cdb --- /dev/null +++ b/config/desktop/plucky/appgroups/programming/custom/desktops/gnome/packages @@ -0,0 +1 @@ +gnome-builder diff --git a/config/desktop/plucky/appgroups/programming/custom/desktops/kde/packages b/config/desktop/plucky/appgroups/programming/custom/desktops/kde/packages new file mode 100644 index 000000000000..5988f0dac2a7 --- /dev/null +++ b/config/desktop/plucky/appgroups/programming/custom/desktops/kde/packages @@ -0,0 +1,2 @@ +kdevelop +qtcreator diff --git a/config/desktop/plucky/appgroups/programming/packages b/config/desktop/plucky/appgroups/programming/packages new file mode 100644 index 000000000000..c50a6ca48058 --- /dev/null +++ b/config/desktop/plucky/appgroups/programming/packages @@ -0,0 +1,4 @@ +build-essential +clang +meld +regexxer diff --git a/config/desktop/plucky/appgroups/remote_desktop/packages b/config/desktop/plucky/appgroups/remote_desktop/packages new file mode 100644 index 000000000000..1b4fb4ec6517 --- /dev/null +++ b/config/desktop/plucky/appgroups/remote_desktop/packages @@ -0,0 +1,3 @@ +remmina +remmina-plugin-vnc +remmina-plugin-rdp diff --git a/config/desktop/plucky/environments/cinnamon/architectures b/config/desktop/plucky/environments/cinnamon/architectures new file mode 100644 index 000000000000..54b43c7a58e9 --- /dev/null +++ b/config/desktop/plucky/environments/cinnamon/architectures @@ -0,0 +1 @@ +arm64, amd64 diff --git a/config/desktop/plucky/environments/cinnamon/armbian/create_desktop_package.sh b/config/desktop/plucky/environments/cinnamon/armbian/create_desktop_package.sh new file mode 100755 index 000000000000..63b8cb05b5a0 --- /dev/null +++ b/config/desktop/plucky/environments/cinnamon/armbian/create_desktop_package.sh @@ -0,0 +1,164 @@ +# install default lightdm greeter settings +cp -R "${SRC}"/packages/blobs/desktop/lightdm "${destination}"/etc/armbian + +# install default desktop settings +mkdir -p "${destination}"/etc/skel +cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel + +# install cinnamon desktop bar icons +mkdir -p "${destination}"/usr/share/icons/armbian +cp "${SRC}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/share/icons/armbian + +# install wallpapers +mkdir -p "${destination}"/usr/share/backgrounds/armbian/ +cp "${SRC}"/packages/blobs/desktop/desktop-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian + +# install lightdm wallpapers +mkdir -p "${destination}"/usr/share/backgrounds/armbian-lightdm/ +cp "${SRC}"/packages/blobs/desktop/lightdm-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian-lightdm + +# install startup icons +mkdir -p "${destination}"/usr/share/pixmaps/armbian +cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian + +# generate wallpaper list for background changer +mkdir -p "${destination}"/usr/share/cinnamon-background-properties +cat < "${destination}"/usr/share/cinnamon-background-properties/armbian.xml + + + + + Armbian black-pyscho + /usr/share/backgrounds/armbian/armbian-4k-black-psycho.jpg + zoom + #ffffff + #000000 + + + Armbian bluie-circle + /usr/share/backgrounds/armbian/armbian-4k-blue-circle.jpg + zoom + #ffffff + #000000 + + + Armbian blue-monday + /usr/share/backgrounds/armbian/armbian-4k-blue-monday.jpg + zoom + #ffffff + #000000 + + + Armbian blue-penguin + /usr/share/backgrounds/armbian/armbian-4k-blue-penguin.jpg + zoom + #ffffff + #000000 + + + Armbian gray-resultado + /usr/share/backgrounds/armbian/armbian-4k-gray.jpg + zoom + #ffffff + #000000 + + + Armbian green-penguin + /usr/share/backgrounds/armbian/armbian-4k-green-penguin.jpg + zoom + #ffffff + #000000 + + + Armbian green-retro + /usr/share/backgrounds/armbian/armbian-4k-green-retro.jpg + zoom + #ffffff + #000000 + + + Armbian green-wall-penguin + /usr/share/backgrounds/armbian/armbian-4k-green-wall-penguin.jpg + zoom + #ffffff + #000000 + + + Armbian 4k-neglated + /usr/share/backgrounds/armbian/armbian-4k-neglated.jpg + zoom + #ffffff + #000000 + + + Armbian neon-gray-penguin + /usr/share/backgrounds/armbian/armbian-4k-neon-gray-penguin.jpg + zoom + #ffffff + #000000 + + + Armbian plastic-love + /usr/share/backgrounds/armbian/armbian-4k-plastic-love.jpg + zoom + #ffffff + #000000 + + + Armbian purple-penguine + /usr/share/backgrounds/armbian/armbian-4k-purple-penguine.jpg + zoom + #ffffff + #000000 + + + Armbian purplepunk-resultado + /usr/share/backgrounds/armbian/armbian-4k-purplepunk.jpg + zoom + #ffffff + #000000 + + + Armbian red-penguin-dark + /usr/share/backgrounds/armbian/armbian-4k-red-penguin-dark.jpg + zoom + #ffffff + #000000 + + + Armbian red-penguin + /usr/share/backgrounds/armbian/armbian-4k-red-penguin.jpg + zoom + #ffffff + #000000 + + + Armbian light + /usr/share/backgrounds/armbian/armbian18-Dre0x-Minum-light-3840x2160.jpg + zoom + #ffffff + #000000 + + + Armbian dark + /usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg + zoom + #ffffff + #000000 + + + Armbian uc + /usr/share/backgrounds/armbian/armbian-full-under-construction-3840-2160.jpg + zoom + #ffffff + #000000 + + + Armbian clear + /usr/share/backgrounds/armbian/Armbian-clear-rounded-bakcground-3840-2160.jpg + zoom + #ffffff + #000000 + + +EOF diff --git a/config/desktop/plucky/environments/cinnamon/config_base/packages b/config/desktop/plucky/environments/cinnamon/config_base/packages new file mode 100644 index 000000000000..04be07f610f2 --- /dev/null +++ b/config/desktop/plucky/environments/cinnamon/config_base/packages @@ -0,0 +1,128 @@ +anacron +apt-xapian-index +blueman +bluez +bluez-cups +bluez-tools +brltty +brltty-x11 +cifs-utils +cinnamon +cinnamon-common +cinnamon-control-center +cinnamon-control-center-data +cinnamon-core +cinnamon-desktop-data +cinnamon-screensaver +cinnamon-session +cinnamon-session-common +cinnamon-settings-daemon +colord +cups +cups-bsd +cups-client +cups-filters +dbus-x11 +dconf-cli +evince +evince-common +fontconfig +fontconfig-config +fonts-noto-cjk +fonts-ubuntu +fonts-ubuntu-console +foomatic-db-compressed-ppds +gdebi +ghostscript-x +gir1.2-cinnamondesktop-3.0 +gir1.2-cmenu-3.0 +gir1.2-cvc-1.0 +gnome-disk-utility +gnome-screenshot +gnome-disk-utility +gnome-system-monitor +gnome-terminal +gstreamer1.0-packagekit +gstreamer1.0-plugins-base-apps +gstreamer1.0-pulseaudio +gtk2-engines +gtk2-engines-murrine +gtk2-engines-pixbuf +gvfs-backends +hplip +indicator-printers +inxi +inputattach +keyutils +language-pack-gnome-de +language-pack-gnome-en +language-pack-gnome-ru +language-pack-gnome-sl +laptop-detect +libatk-adaptor +libcinnamon-desktop4 +libcinnamon-menu-3-0 +libcvc0 +libgl1-mesa-dri +libgsettings-qt1 +libgtk2.0-bin +libnotify-bin +libxcursor1 +lightdm +lm-sensors +lxtask +mesa-utils +mousepad +mousetweaks +nemo +nemo-data +nemo-fileroller +nemo-font-manager +nemo-gtkhash +numix-gtk-theme +numix-icon-theme +numix-icon-theme-circle +openprinting-ppds +p7zip-full +pamix +pasystray +pavucontrol +policykit-1 +policykit-desktop-privileges +printer-driver-all +profile-sync-daemon +pulseaudio-module-bluetooth +redshift +slick-greeter +smbclient +software-properties-gtk +spice-vdagent +synaptic +system-config-printer +system-config-printer-common +terminator +update-manager +update-manager-core +viewnior +x11-apps +x11-utils +x11-xserver-utils +xapps-common +xarchiver +xbacklight +xcursor-themes +xdg-user-dirs +xdg-user-dirs-gtk +xfonts-100dpi +xfonts-75dpi +xfonts-base +xfonts-encodings +xfonts-scalable +xfonts-utils +xorg-docs-core +xscreensaver +xsensors +xserver-xorg +xserver-xorg-video-fbdev +xauth +xwallpaper diff --git a/config/desktop/plucky/environments/cinnamon/config_base/packages.uninstall b/config/desktop/plucky/environments/cinnamon/config_base/packages.uninstall new file mode 100644 index 000000000000..af8fee8b39a0 --- /dev/null +++ b/config/desktop/plucky/environments/cinnamon/config_base/packages.uninstall @@ -0,0 +1,2 @@ +gnome-software +gnome-keyring diff --git a/config/desktop/plucky/environments/cinnamon/debian/postinst b/config/desktop/plucky/environments/cinnamon/debian/postinst new file mode 100755 index 000000000000..76fa00f95d72 --- /dev/null +++ b/config/desktop/plucky/environments/cinnamon/debian/postinst @@ -0,0 +1,134 @@ +# overwrite stock lightdm greeter configuration +if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; fi +#if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/armbian03-Dre0x-Minum-dark-blurred-3840x2160.jpg/armbian-4k-neon-gray-penguin-gauss.jpg/g' /etc/lightdm/slick-greeter.conf; fi + +# disable Pulseaudio timer scheduling which does not work with sndhdmi driver +if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi + +##dconf desktop settings +keys=/etc/dconf/db/local.d/00-desktop +profile=/etc/dconf/profile/user + +install -Dv /dev/null $keys +install -Dv /dev/null $profile + +# gather dconf settings +# deconf dump org/nemo/ > nemo_backup +# deconf dump org/cinnamon/ > cinnamon_desktop_backup + +echo "[org/nemo/list-view] +default-visible-columns=['name', 'size', 'type', 'date_modified', 'owner', 'permissions'] + +[org/nemo/preferences] +quick-renames-with-pause-in-between=true +show-advanced-permissions=true +show-compact-view-icon-toolbar=false +show-full-path-titles=true +show-hidden-files=true +show-home-icon-toolbar=true +show-icon-view-icon-toolbar=false +show-image-thumbnails='never' +show-list-view-icon-toolbar=false +show-new-folder-icon-toolbar=true +show-open-in-terminal-toolbar=true + +[org/nemo/window-state] +geometry='800x550+550+244' +maximized=false +sidebar-bookmark-breakpoint=5 + +[org/cinnamon] +desklet-decorations=0 +desktop-effects=false +enabled-applets=['panel1:left:0:menu@cinnamon.org:0', 'panel1:left:1:show-desktop@cinnamon.org:1', 'panel1:left:2:grouped-window-list@cinnamon.org:2', 'panel1:right:0:systray@cinnamon.org:3', 'panel1:right:1:xapp-status@cinnamon.org:4', 'panel1:right:2:notifications@cinnamon.org:5', 'panel1:right:3:printers@cinnamon.org:6', 'panel1:right:4:removable-drives@cinnamon.org:7', 'panel1:right:5:keyboard@cinnamon.org:8', 'panel1:right:6:favorites@cinnamon.org:9', 'panel1:right:7:network@cinnamon.org:10', 'panel1:right:8:sound@cinnamon.org:11', 'panel1:right:9:power@cinnamon.org:12', 'panel1:right:10:calendar@cinnamon.org:13'] +enabled-desklets=@as [] +next-applet-id=14 +panels-height=['1:33'] +panels-resizable=['1:true'] +startup-animation=false + +[org/cinnamon/desktop/a11y/applications] +screen-keyboard-enabled=false +screen-reader-enabled=false + +[org/cinnamon/desktop/a11y/mouse] +dwell-click-enabled=false +dwell-threshold=10 +dwell-time=1.2 +secondary-click-enabled=false +secondary-click-time=1.2 + +[org/cinnamon/desktop/background] +picture-options='zoom' +picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg' +primary-color='#456789' +secondary-color='#FFFFFF' + +[org/cinnamon/desktop/applications/terminal] +exec='/usr/bin/terminator' + +[org/cinnamon/desktop/default-applications/terminal] +exec='/usr/bin/terminator' + +[org/cinnamon/desktop/interface] +clock-show-date=true +cursor-theme='whiteglass' +gtk-theme='Numix' +icon-theme='Numix' +scaling-factor=uint32 0 +toolkit-accessibility=false + +[org/cinnamon/desktop/media-handling] +autorun-never=false + +[org/cinnamon/desktop/screensaver] +picture-options='zoom' +picture-uri='file:///usr/share/backgrounds/armbian-lightdm/armbian03-Dre0x-Minum-dark-3840x2160' +primary-color='#456789' +secondary-color='#FFFFFF' + +[org/cinnamon/desktop/wm/preferences] +num-workspaces=2 +theme='Numix' + +[org/cinnamon/settings-daemon/peripherals/touchpad] +disable-while-typing=true +horiz-scroll-enabled=false +motion-acceleration=5.4820717131474108 +motion-threshold=2 +natural-scroll=false +scroll-method='two-finger-scrolling' +three-finger-click=2 +two-finger-click=3 + +[org/cinnamon/settings-daemon/plugins/power] +button-power='interactive' +critical-battery-action='hibernate' +idle-brightness=30 +idle-dim-time=90 +lid-close-ac-action='nothing' +lid-close-battery-action='nothing' +sleep-display-ac=600 +sleep-display-battery=600 +sleep-inactive-ac-timeout=0 +sleep-inactive-battery-timeout=0 + +[org/cinnamon/settings-daemon/plugins/xsettings] +buttons-have-icons=true +menus-have-icons=true + +[org/cinnamon/sounds] +login-enabled=false +logout-enabled=false +plug-enabled=false +switch-enabled=false +tile-enabled=false +unplug-enabled=false" >> $keys + +echo "user-db:user +system-db:local" >> $profile + +dconf update + +#re-compile schemas +if [ -d /usr/share/glib-2.0/schemas ]; then glib-compile-schemas /usr/share/glib-2.0/schemas; fi diff --git a/config/desktop/plucky/environments/cinnamon/support b/config/desktop/plucky/environments/cinnamon/support new file mode 100644 index 000000000000..a23e5fb945c1 --- /dev/null +++ b/config/desktop/plucky/environments/cinnamon/support @@ -0,0 +1 @@ +supported diff --git a/config/desktop/plucky/environments/gnome b/config/desktop/plucky/environments/gnome new file mode 120000 index 000000000000..88d92c677df0 --- /dev/null +++ b/config/desktop/plucky/environments/gnome @@ -0,0 +1 @@ +../../common/environments/gnome \ No newline at end of file diff --git a/config/desktop/plucky/environments/i3-wm/architectures b/config/desktop/plucky/environments/i3-wm/architectures new file mode 100644 index 000000000000..f4ca77356932 --- /dev/null +++ b/config/desktop/plucky/environments/i3-wm/architectures @@ -0,0 +1 @@ +armhf, arm64, amd64, riscv64 diff --git a/config/desktop/plucky/environments/i3-wm/armbian/create_desktop_package.sh b/config/desktop/plucky/environments/i3-wm/armbian/create_desktop_package.sh new file mode 100644 index 000000000000..12f8dca6157b --- /dev/null +++ b/config/desktop/plucky/environments/i3-wm/armbian/create_desktop_package.sh @@ -0,0 +1,14 @@ +# install lightdm greeter +cp -R "${SRC}"/packages/blobs/desktop/lightdm "${destination}"/etc/armbian + +# install default desktop settings +mkdir -p "${destination}"/etc/skel +cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel + +# install logo for login screen +mkdir -p "${destination}"/usr/share/pixmaps/armbian +cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian + +# install wallpapers +mkdir -p "${destination}"/usr/share/backgrounds/armbian/ +cp "${SRC}"/packages/blobs/desktop/desktop-wallpapers/armbian*.jpg "${destination}"/usr/share/backgrounds/armbian/ diff --git a/config/desktop/plucky/environments/i3-wm/config_base/packages b/config/desktop/plucky/environments/i3-wm/config_base/packages new file mode 100644 index 000000000000..c1fdc8fc11cb --- /dev/null +++ b/config/desktop/plucky/environments/i3-wm/config_base/packages @@ -0,0 +1,146 @@ +anacron +apport-gtk +apt-xapian-index +arandr +blueman +bluez +bluez-cups +bluez-tools +brltty +brltty-x11 +caffeine +cifs-utils +compton +cups +cups-bsd +cups-client +cups-filters +dbus-x11 +dictionaries-common +dmz-cursor-theme +doc-base +dunst +evince +evince-common +feh +fontconfig +fontconfig-config +fonts-arphic-ukai +fonts-arphic-uming +fonts-dejavu-core +fonts-freefont-ttf +fonts-guru +fonts-guru-extra +fonts-khmeros-core +fonts-liberation +fonts-nanum +fonts-opensymbol +fonts-stix +fonts-symbola +fonts-ubuntu +foomatic-db-compressed-ppds +gdebi +ghostscript-x +gir1.2-appindicator3-0.1 +gnome-bluetooth +gnome-disk-utility +gnome-font-viewer +gnome-power-manager +gnome-system-monitor +gromit +gstreamer1.0-packagekit +gstreamer1.0-plugins-base-apps +gvfs-backends +hplip +i3 +i3lock +i3status +i3-wm +suckless-tools +indicator-printers +inputattach +kerneloops +keyutils +language-pack-en +laptop-detect +libanyevent-i3-perl +libatk-adaptor +libfont-afm-perl +libfontconfig1 +libfontenc1 +libgail-common +libgl1-mesa-dri +libgsettings-qt1 +libjson-xs-perl +libnotify-bin +libproxy1-plugin-gsettings +libu2f-udev +libwmf0.2-7-gtk +libxcb-cursor0 +libxcursor1 +lightdm +lightdm-gtk-greeter +lightdm-gtk-greeter-settings +lightdm-settings +lxappearance +mousetweaks +nitrogen +numix-gtk-theme +openprinting-ppds +overlay-scrollbar +overlay-scrollbar-gtk2 +p7zip-full +pamix +pasystray +pavucontrol +pavucontrol-qt +policykit-1 +policykit-1-gnome +policykit-desktop-privileges +printer-driver-all +profile-sync-daemon +redshift +rofi +samba +slick-greeter +smbclient +system-config-printer +software-properties-gtk +speech-dispatcher +spice-vdagent +terminator +thunar +totem +totem-common +totem-plugins +ubuntu-docs +ubuntu-drivers-common +ubuntu-wallpapers +update-inetd +update-manager +update-manager-core +update-notifier +update-notifier-common +vifm +x11-apps +x11-xserver-utils +xarchiver +xbacklight +xcursor-themes +xdg-user-dirs +xdg-user-dirs-gtk +xfonts-100dpi +xfonts-75dpi +xfonts-base +xfonts-encodings +xfonts-scalable +xfonts-utils +xorg-docs +xorg-docs-core +xscreensaver +xserver-xorg +xserver-xorg-video-fbdev +xauth +xtitle +xttitle +xwallpaper diff --git a/config/desktop/plucky/environments/i3-wm/debian/postinst b/config/desktop/plucky/environments/i3-wm/debian/postinst new file mode 100644 index 000000000000..5eeeaa17ff47 --- /dev/null +++ b/config/desktop/plucky/environments/i3-wm/debian/postinst @@ -0,0 +1,41 @@ +# overwrite stock lightdm greeter configuration +if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; fi + +# Disable Pulseaudio timer scheduling which does not work with sndhdmi driver +if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi + +# set wallpapper to armbian +echo "exec_always --no-startup-id feh --bg-scale --zoom fill --no-fehbg /usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg" | tee -a /etc/i3/config + +# lightdm wallpaper +mv /etc/lightdm/slick-greeter.conf /etc/lightdm/slick-greeter.conf.bak +touch /etc/lightdm/slick-greeter.conf +echo "[Greeter] +background=/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg +theme-name = Numix +icon-theme-name = Numix +font-name = Sans 11 +draw-user-background = false +show-keyboard = true +onscreen-keyboard = false +screen-reader = true +draw-grid = true" | tee -a /etc/lightdm/slick-greeter.conf + +echo "Finished preparing /etc/lightdm/slick-greeter.conf..." + +mv /etc/lightdm/lightdm-gtk-greeter.conf /etc/lightdm/lightdm-gtk-greeter.conf.bak +touch /etc/lightdm/lightdm-gtk-greeter.conf +echo "[greeter] +background=/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg +theme-name = Numix +icon-theme-name = Numix +font-name = Sans 11 +draw-user-background = false +show-keyboard = true +onscreen-keyboard = false +screen-reader = true +draw-grid = true" | tee -a /etc/lightdm/lightdm-gtk-greeter.conf + +echo "Finished preparing /etc/lightdm/lightdm-gtk-greeter.conf..." + +slick-greeter -h #applies wallpaper diff --git a/config/desktop/plucky/environments/i3-wm/support b/config/desktop/plucky/environments/i3-wm/support new file mode 100644 index 000000000000..0b0206d21c91 --- /dev/null +++ b/config/desktop/plucky/environments/i3-wm/support @@ -0,0 +1 @@ +supported \ No newline at end of file diff --git a/config/desktop/plucky/environments/kde-neon/architectures b/config/desktop/plucky/environments/kde-neon/architectures new file mode 120000 index 000000000000..d93144c069b0 --- /dev/null +++ b/config/desktop/plucky/environments/kde-neon/architectures @@ -0,0 +1 @@ +../../../common/environments/kde-plasma/architectures \ No newline at end of file diff --git a/config/desktop/plucky/environments/kde-neon/armbian b/config/desktop/plucky/environments/kde-neon/armbian new file mode 120000 index 000000000000..66eb11f76328 --- /dev/null +++ b/config/desktop/plucky/environments/kde-neon/armbian @@ -0,0 +1 @@ +../../../common/environments/kde-plasma/armbian \ No newline at end of file diff --git a/config/desktop/plucky/environments/kde-neon/config_base/packages b/config/desktop/plucky/environments/kde-neon/config_base/packages new file mode 100644 index 000000000000..713143abaf67 --- /dev/null +++ b/config/desktop/plucky/environments/kde-neon/config_base/packages @@ -0,0 +1,10 @@ +neon-desktop +kde-standard +sddm +plasma-nm +plasma-pa +plasma-discover +plasma-vault +scdaemon +kscreen +bluedevil diff --git a/config/desktop/plucky/environments/kde-neon/config_base/packages.uninstall b/config/desktop/plucky/environments/kde-neon/config_base/packages.uninstall new file mode 120000 index 000000000000..f569eddb09c9 --- /dev/null +++ b/config/desktop/plucky/environments/kde-neon/config_base/packages.uninstall @@ -0,0 +1 @@ +../../../../common/environments/kde-plasma/config_base/packages.uninstall \ No newline at end of file diff --git a/config/desktop/plucky/environments/kde-neon/debian b/config/desktop/plucky/environments/kde-neon/debian new file mode 120000 index 000000000000..1ff8b65acc03 --- /dev/null +++ b/config/desktop/plucky/environments/kde-neon/debian @@ -0,0 +1 @@ +../../../common/environments/kde-plasma/debian \ No newline at end of file diff --git a/config/desktop/plucky/environments/kde-neon/sources/apt/neon.gpg b/config/desktop/plucky/environments/kde-neon/sources/apt/neon.gpg new file mode 100644 index 0000000000000000000000000000000000000000..fe91a10436cb6d0599d7731f2adea22069a4ed63 GIT binary patch literal 1108 zcmV-a1gra*0u2OKbI5c75CEz7)|OqslF_biIeQ7|CZVL=__SR^k(jK5Luvi(fG3D+ zS#^whp>7Av-Y6bPkU(beL5Sk1@lj70bo&&Am1PHY{kCo8Yg_YkAO*+E7*T*gftR_Z zqmC6utIMI4*S-8S`6v#=EhX0qFyQ)^(wapcj-sBRi*7xbqLuBkF7J>`mZ|(~!z!UD!TLTk0-2d{M!ae?k&gzVhEJ?qQx$ z{A3OGEof~~=l%bqo*E{tJJl?eC$ z1a(@M>ayp}IrdX$o^?stJjxzck$-Jt+MLhqp|LuJ_he??8$iE%;o=KNDZ#wA@iH=* zJP#)iIaz*Nz&~B5-lk1?X#k9b=aZN{L7&h2^A}0nn$VmE_QL#(!ho5eOio74qRueE z&TsLC5_<;&YT!Xl;FWQVaO~!L+P3Zs*B=0+!+5Q-rNIPWoPIAIC2@4So|NKY`&zRZH)vu`aH=un~@eo;F)p5*fIFa?nJ>rd164eA@_V;RVofGCwqhXXkUr4Ni+B z@xqX5+8aQ}2oP2L#h(F#sMHyT2Z$Olc|K&U#{koLaNcY`^5rE*c6z8>c49}=2(Yr> aE~KuGi7;J4pa`jAR9>oX%R%U@c}ZwbZW8