From d5c6880d437a487ee82438b1820d0e5c55a4b185 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Mon, 5 Jul 2021 17:36:00 +0200 Subject: [PATCH 01/10] Add support for desktop board support package Extracting from https://github.com/armbian/build/pull/2776 which can be closed after. --- lib/configuration.sh | 10 ++++- lib/desktop.sh | 93 +++++++++++++++++++++++++++++++++++++++++++- lib/distributions.sh | 3 +- lib/main.sh | 4 +- 4 files changed, 106 insertions(+), 4 deletions(-) diff --git a/lib/configuration.sh b/lib/configuration.sh index a271cb095952..cf66a3f4ac70 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -373,7 +373,7 @@ fi AGGREGATION_SEARCH_ROOT_ABSOLUTE_DIRS=" ${SRC}/config -${SRC}/config/optional/_any_board/_configs +${SRC}/config/optional/_any_board/_config ${SRC}/config/optional/architectures/${ARCH}/_config ${SRC}/config/optional/families/${LINUXFAMILY}/_config ${SRC}/config/optional/boards/${BOARD}/_config @@ -390,6 +390,14 @@ cli/_all_distributions/main cli/${RELEASE}/main " +PACKAGES_SEARCH_ROOT_ABSOLUTE_DIRS=" +${SRC}/packages +${SRC}/config/optional/_any_board/_packages +${SRC}/config/optional/architectures/${ARCH}/_packages +${SRC}/config/optional/families/${LINUXFAMILY}/_packages +${SRC}/config/optional/boards/${BOARD}/_packages +" + DESKTOP_ENVIRONMENTS_SEARCH_RELATIVE_DIRS=" desktop/_all_distributions/environments/_all_environments desktop/_all_distributions/environments/${DESKTOP_ENVIRONMENT} diff --git a/lib/desktop.sh b/lib/desktop.sh index 4efba1f56f03..cf4922bab3ef 100644 --- a/lib/desktop.sh +++ b/lib/desktop.sh @@ -62,7 +62,7 @@ create_desktop_package () Installed-Size: 1 Section: xorg Priority: optional - Recommends: ${DEBIAN_RECOMMENDS//[:space:]+/,} + Recommends: ${DEBIAN_RECOMMENDS//[:space:]+/,}, armbian-bsp-desktop Provides: ${CHOSEN_DESKTOP}, armbian-${RELEASE}-desktop Pre-Depends: ${PACKAGE_LIST_PREDEPENDS//[:space:]+/,} Description: Armbian desktop for ${DISTRIBUTION} ${RELEASE} @@ -117,6 +117,97 @@ create_desktop_package () +copy_all_packages_files_for() +{ + local package_name="${1}" + for package_src_dir in ${PACKAGES_SEARCH_ROOT_ABSOLUTE_DIRS}; + do + local package_dirpath="${package_src_dir}/${package_name}" + if [ -d "${package_dirpath}" ]; + then + cp -r "${package_dirpath}/"* "${destination}/" + echo "${package_dirpath}" + echo ${package_dirpath} >> "${DEST}"/debug/copy.log + fi + done +} + +create_bsp_desktop_package () +{ + + local package_name="${BSP_DESKTOP_PACKAGE_FULLNAME}" + + local destination tmp_dir + tmp_dir=$(mktemp -d) + destination=${tmp_dir}/${BOARD}/${BSP_DESKTOP_PACKAGE_FULLNAME} + rm -rf "${destination}" + mkdir -p "${destination}"/DEBIAN + + copy_all_packages_files_for "bsp-desktop" + + # set up control file + cat <<-EOF > "${destination}"/DEBIAN/control + Package: armbian-bsp-desktop-${BOARD} + Version: $REVISION + Architecture: all + Maintainer: $MAINTAINER <$MAINTAINERMAIL> + Installed-Size: 1 + Section: xorg + Priority: optional + Provides: armbian-bsp-desktop, armbian-bsp-desktop-${BOARD} + Description: Armbian Board Specific Packages for desktop users using ${BOARD} machines + EOF + + #display_alert "Showing ${destination}/DEBIAN/control" + cat "${destination}"/DEBIAN/control >> "${DEST}"/debug/install.log + + # Recreating the DEBIAN/postinst file + echo "#!/bin/sh -e" > "${destination}/DEBIAN/postinst" + + local aggregated_content="" + + aggregate_all_desktop "debian/armbian-bsp-desktop/postinst" $'\n' + + echo "${aggregated_content}" >> "${destination}/DEBIAN/postinst" + echo "exit 0" >> "${destination}/DEBIAN/postinst" + + chmod 755 "${destination}"/DEBIAN/postinst + + #display_alert "Showing ${destination}/DEBIAN/postinst" + cat "${destination}/DEBIAN/postinst" >> "${DEST}"/debug/install.log + + # Armbian create_desktop_package scripts + + unset aggregated_content + + # Myy : I'm preparing the common armbian folders, in advance, since the scripts are now splitted + mkdir -p "${destination}"/etc/armbian + + local aggregated_content="" + + aggregate_all_desktop "debian/armbian-bsp-desktop/prepare.sh" $'\n' + + # display_alert "Showing the user scripts executed in create_desktop_package" + echo "${aggregated_content}" >> "${DEST}"/debug/install.log + eval "${aggregated_content}" + + # create board DEB file + display_alert "Building desktop package" "${package_name}" "info" + + mkdir -p "${DEB_STORAGE}/${RELEASE}" + cd "${destination}"; cd .. + fakeroot dpkg-deb -b "${destination}" "${DEB_STORAGE}/${RELEASE}/${package_name}.deb" >/dev/null + + # cleanup + rm -rf "${tmp_dir}" + + unset aggregated_content + +} + + + + install_ppa_prerequisites() { # Myy : So... The whole idea is that, a good bunch of external sources diff --git a/lib/distributions.sh b/lib/distributions.sh index b00436628795..67db2e779ac0 100644 --- a/lib/distributions.sh +++ b/lib/distributions.sh @@ -305,7 +305,8 @@ install_common() # install armbian-desktop if [[ "${REPOSITORY_INSTALL}" != *armbian-desktop* ]]; then if [[ $BUILD_DESKTOP == yes ]]; then - install_deb_chroot "${DEB_STORAGE}/$RELEASE/${CHOSEN_DESKTOP}_${REVISION}_all.deb" + install_deb_chroot "${DEB_STORAGE}/${RELEASE}/${CHOSEN_DESKTOP}_${REVISION}_all.deb" + install_deb_chroot "${DEB_STORAGE}/${RELEASE}/${BSP_DESKTOP_PACKAGE_FULLNAME}.deb" # install display manager and PACKAGE_LIST_DESKTOP_FULL packages if enabled per board desktop_postinstall fi diff --git a/lib/main.sh b/lib/main.sh index c6c5b16c4360..7fa4b3ae39a3 100644 --- a/lib/main.sh +++ b/lib/main.sh @@ -410,6 +410,8 @@ LINUXSOURCEDIR="${KERNELDIR}/$(branch2dir "${KERNELBRANCH}")" BSP_CLI_PACKAGE_NAME="armbian-bsp-cli-${BOARD}" BSP_CLI_PACKAGE_FULLNAME="${BSP_CLI_PACKAGE_NAME}_${REVISION}_${ARCH}" +BSP_DESKTOP_PACKAGE_NAME="armbian-bsp-desktop-${BOARD}" +BSP_DESKTOP_PACKAGE_FULLNAME="${BSP_DESKTOP_PACKAGE_NAME}_${REVISION}_${ARCH}" CHOSEN_UBOOT=linux-u-boot-${BOARD}-${BRANCH} CHOSEN_KERNEL=linux-image-${BRANCH}-${LINUXFAMILY} @@ -516,7 +518,7 @@ overlayfs_wrapper "cleanup" # create desktop package [[ -n $RELEASE && $DESKTOP_ENVIRONMENT && ! -f ${DEB_STORAGE}/$RELEASE/${CHOSEN_DESKTOP}_${REVISION}_all.deb ]] && create_desktop_package - +[[ -n $RELEASE && $DESKTOP_ENVIRONMENT && ! -f ${DEB_STORAGE}/${RELEASE}/${BSP_DESKTOP_PACKAGE_FULLNAME}.deb ]] && create_bsp_desktop_package From 58ebd450c6a3c9b707fba31a129d29979ff12e86 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Mon, 5 Jul 2021 19:43:02 +0200 Subject: [PATCH 02/10] Desktop BSP creation is working, but need broader testing and some quick how-to --- .../xfce/debian/armbian-bsp-desktop/postinst | 1 + .../debian/armbian-bsp-desktop/prepare.sh | 3 ++ .../armbian-bsp-desktop/prepare.sh} | 0 .../boards/nanopct4/_packages/README.md | 1 + .../armbian-bsp-desktop/prepare.sh} | 0 .../armbian-bsp-desktop/prepare.sh} | 0 lib/desktop.sh | 30 ++++--------------- packages/README.md | 5 ++++ 8 files changed, 16 insertions(+), 24 deletions(-) create mode 100644 config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/postinst create mode 100755 config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/prepare.sh rename config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/{armbian/create_desktop_package.sh => debian/armbian-bsp-desktop/prepare.sh} (100%) mode change 100644 => 100755 create mode 100644 config/optional/boards/nanopct4/_packages/README.md rename config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/{armbian/create_desktop_package.sh => debian/armbian-bsp-desktop/prepare.sh} (100%) mode change 100644 => 100755 rename config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/{armbian/create_desktop_package.sh => debian/armbian-bsp-desktop/prepare.sh} (100%) mode change 100644 => 100755 create mode 100644 packages/README.md diff --git a/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/postinst b/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/postinst new file mode 100644 index 000000000000..38327722c91f --- /dev/null +++ b/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/postinst @@ -0,0 +1 @@ +echo "test" diff --git a/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/prepare.sh b/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/prepare.sh new file mode 100755 index 000000000000..65391f2acfd2 --- /dev/null +++ b/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/prepare.sh @@ -0,0 +1,3 @@ +# install default desktop settings +mkdir -p "${destination}"/etc/skel +cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel diff --git a/config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/armbian/create_desktop_package.sh b/config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh old mode 100644 new mode 100755 similarity index 100% rename from config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/armbian/create_desktop_package.sh rename to config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh diff --git a/config/optional/boards/nanopct4/_packages/README.md b/config/optional/boards/nanopct4/_packages/README.md new file mode 100644 index 000000000000..6cadf7d247a6 --- /dev/null +++ b/config/optional/boards/nanopct4/_packages/README.md @@ -0,0 +1 @@ +Overlay for NanoPC T4 board diff --git a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/armbian/create_desktop_package.sh b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh old mode 100644 new mode 100755 similarity index 100% rename from config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/armbian/create_desktop_package.sh rename to config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh diff --git a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/armbian/create_desktop_package.sh b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh old mode 100644 new mode 100755 similarity index 100% rename from config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/armbian/create_desktop_package.sh rename to config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh diff --git a/lib/desktop.sh b/lib/desktop.sh index cf4922bab3ef..36e0ff104e8f 100644 --- a/lib/desktop.sh +++ b/lib/desktop.sh @@ -23,8 +23,6 @@ create_desktop_package () { - # join and cleanup package list - # Remove leading and trailing whitespaces echo "Showing PACKAGE_LIST_DESKTOP before postprocessing" >> "${DEST}"/debug/output.log # Use quotes to show leading and trailing spaces echo "\"$PACKAGE_LIST_DESKTOP\"" >> "${DEST}"/debug/output.log @@ -68,9 +66,6 @@ create_desktop_package () Description: Armbian desktop for ${DISTRIBUTION} ${RELEASE} EOF - #display_alert "Showing ${destination}/DEBIAN/control" - cat "${destination}"/DEBIAN/control >> "${DEST}"/debug/install.log - # Recreating the DEBIAN/postinst file echo "#!/bin/sh -e" > "${destination}/DEBIAN/postinst" @@ -89,16 +84,12 @@ create_desktop_package () unset aggregated_content - # Myy : I'm preparing the common armbian folders, in advance, since the scripts are now splitted mkdir -p "${destination}"/etc/armbian local aggregated_content="" - aggregate_all_desktop "armbian/create_desktop_package.sh" $'\n' - - # display_alert "Showing the user scripts executed in create_desktop_package" - echo "${aggregated_content}" >> "${DEST}"/debug/install.log eval "${aggregated_content}" + [[ $? -ne 0 ]] && display_alert "create_desktop_package.sh exec error" "" "wrn" # create board DEB file display_alert "Building desktop package" "${CHOSEN_DESKTOP}_${REVISION}_all" "info" @@ -126,12 +117,14 @@ copy_all_packages_files_for() if [ -d "${package_dirpath}" ]; then cp -r "${package_dirpath}/"* "${destination}/" - echo "${package_dirpath}" - echo ${package_dirpath} >> "${DEST}"/debug/copy.log + display_alert ">>> adding files from" "${package_dirpath}" fi done } + + + create_bsp_desktop_package () { @@ -158,14 +151,10 @@ create_bsp_desktop_package () Description: Armbian Board Specific Packages for desktop users using ${BOARD} machines EOF - #display_alert "Showing ${destination}/DEBIAN/control" - cat "${destination}"/DEBIAN/control >> "${DEST}"/debug/install.log - # Recreating the DEBIAN/postinst file echo "#!/bin/sh -e" > "${destination}/DEBIAN/postinst" local aggregated_content="" - aggregate_all_desktop "debian/armbian-bsp-desktop/postinst" $'\n' echo "${aggregated_content}" >> "${destination}/DEBIAN/postinst" @@ -173,23 +162,16 @@ create_bsp_desktop_package () chmod 755 "${destination}"/DEBIAN/postinst - #display_alert "Showing ${destination}/DEBIAN/postinst" - cat "${destination}/DEBIAN/postinst" >> "${DEST}"/debug/install.log - # Armbian create_desktop_package scripts unset aggregated_content - # Myy : I'm preparing the common armbian folders, in advance, since the scripts are now splitted mkdir -p "${destination}"/etc/armbian local aggregated_content="" - aggregate_all_desktop "debian/armbian-bsp-desktop/prepare.sh" $'\n' - - # display_alert "Showing the user scripts executed in create_desktop_package" - echo "${aggregated_content}" >> "${DEST}"/debug/install.log eval "${aggregated_content}" + [[ $? -ne 0 ]] && display_alert "prepare.sh exec error" "" "wrn" # create board DEB file display_alert "Building desktop package" "${package_name}" "info" diff --git a/packages/README.md b/packages/README.md new file mode 100644 index 000000000000..d5888715154f --- /dev/null +++ b/packages/README.md @@ -0,0 +1,5 @@ +armbian +blobs +bsp +bsp-desktop | common desktop board support packages overlay +extras-buildpkgs From 79a5991d372e703b5ecb73588fc522567926cacb Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Mon, 5 Jul 2021 19:59:02 +0200 Subject: [PATCH 03/10] Cleanup --- .../environments/xfce/debian/armbian-bsp-desktop/postinst | 1 - .../environments/xfce/debian/armbian-bsp-desktop/prepare.sh | 3 --- lib/desktop.sh | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/postinst delete mode 100755 config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/prepare.sh diff --git a/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/postinst b/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/postinst deleted file mode 100644 index 38327722c91f..000000000000 --- a/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/postinst +++ /dev/null @@ -1 +0,0 @@ -echo "test" diff --git a/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/prepare.sh b/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/prepare.sh deleted file mode 100755 index 65391f2acfd2..000000000000 --- a/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/prepare.sh +++ /dev/null @@ -1,3 +0,0 @@ -# install default desktop settings -mkdir -p "${destination}"/etc/skel -cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel diff --git a/lib/desktop.sh b/lib/desktop.sh index 36e0ff104e8f..02980106954b 100644 --- a/lib/desktop.sh +++ b/lib/desktop.sh @@ -116,7 +116,7 @@ copy_all_packages_files_for() local package_dirpath="${package_src_dir}/${package_name}" if [ -d "${package_dirpath}" ]; then - cp -r "${package_dirpath}/"* "${destination}/" + cp -r "${package_dirpath}/"* "${destination}/" 2> /dev/null display_alert ">>> adding files from" "${package_dirpath}" fi done From 054b9eaa9be98969a22116379bc90551a232faa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 5 Jul 2021 20:48:48 +0200 Subject: [PATCH 04/10] Update README.md --- packages/README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/README.md b/packages/README.md index d5888715154f..aa6db3973357 100644 --- a/packages/README.md +++ b/packages/README.md @@ -1,5 +1,6 @@ -armbian -blobs -bsp -bsp-desktop | common desktop board support packages overlay -extras-buildpkgs +|:--|:--| +|armbian|| +|blobs|| +|bsp|| +|bsp-desktop | common desktop board support packages overlay| +|extras-buildpkgs|| From 6a76888983ab4a38e377f9274effc8f72bab6f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 5 Jul 2021 20:49:20 +0200 Subject: [PATCH 05/10] Update README.md --- packages/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/README.md b/packages/README.md index aa6db3973357..58ccdbf2e3e9 100644 --- a/packages/README.md +++ b/packages/README.md @@ -1,3 +1,4 @@ +|folder|function| |:--|:--| |armbian|| |blobs|| From 96ff8998bd38a191ce8ee5888112af792bbc009d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 5 Jul 2021 20:50:48 +0200 Subject: [PATCH 06/10] Update README.md --- packages/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/README.md b/packages/README.md index 58ccdbf2e3e9..0a625bdc33ad 100644 --- a/packages/README.md +++ b/packages/README.md @@ -1,6 +1,6 @@ |folder|function| |:--|:--| -|armbian|| +|armbian|deb packaging scripts| |blobs|| |bsp|| |bsp-desktop | common desktop board support packages overlay| From 942aac4e327f03aa992f0a2ba1ceacaef1082763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 5 Jul 2021 20:51:12 +0200 Subject: [PATCH 07/10] Update README.md --- packages/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/README.md b/packages/README.md index 0a625bdc33ad..19de0f2e5f6a 100644 --- a/packages/README.md +++ b/packages/README.md @@ -1,6 +1,6 @@ |folder|function| |:--|:--| -|armbian|deb packaging scripts| +|armbian|kernel deb packaging scripts| |blobs|| |bsp|| |bsp-desktop | common desktop board support packages overlay| From c68867e7e570317b614d3b2ce9b124bce4753c0e Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Mon, 5 Jul 2021 23:39:35 +0200 Subject: [PATCH 08/10] Create empty files as examples where we can put things. --- .../focal/environments/xfce/debian/armbian-bsp-desktop/postinst | 0 .../environments/xfce/debian/armbian-bsp-desktop/prepare.sh | 0 .../_all_environments/debian/armbian-bsp-desktop/prepare.sh | 2 -- config/optional/boards/nanopct4/_packages/README.md | 1 - 4 files changed, 3 deletions(-) create mode 100644 config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/postinst create mode 100644 config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/prepare.sh delete mode 100644 config/optional/boards/nanopct4/_packages/README.md diff --git a/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/postinst b/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/postinst new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/prepare.sh b/config/desktop/focal/environments/xfce/debian/armbian-bsp-desktop/prepare.sh new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh b/config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh index 73de3e9074d6..88727b83b786 100755 --- a/config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh +++ b/config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh @@ -1,7 +1,5 @@ -# install custom asound state for pinebook-pro mkdir -p "${destination}"/etc/ cp -R "${SRC}"/packages/blobs/asound.state/ "${destination}"/etc/ -# install custom xorg for pinebook-pro mkdir -p "${destination}"/etc/X11/ cp -R "${SRC}"/packages/bsp/rk3399/xorg.conf "${destination}"/etc/X11/ diff --git a/config/optional/boards/nanopct4/_packages/README.md b/config/optional/boards/nanopct4/_packages/README.md deleted file mode 100644 index 6cadf7d247a6..000000000000 --- a/config/optional/boards/nanopct4/_packages/README.md +++ /dev/null @@ -1 +0,0 @@ -Overlay for NanoPC T4 board From 0c140cc97c7454e7de2ffcd6e79479316ff5e0c0 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Tue, 6 Jul 2021 00:18:35 +0200 Subject: [PATCH 09/10] Fixing Pinebook desktop bsp creation --- .../environments/xfce/debian/armbian-bsp-desktop/prepare.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh index 03062d15522a..41e9b8ee3109 100755 --- a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh +++ b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh @@ -1,4 +1,5 @@ # powerconfig, touchpad, and special keys -cp $SRC/packages/bsp/pinebook-pro/xfce4-power-manager.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ -cp $SRC/packages/bsp/pinebook-pro/pointers.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ +mkdir -p $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ +cp $SRC/packages/bsp/pinebook-pro/xfce4-power-manager.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ +cp $SRC/packages/bsp/pinebook-pro/pointers.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ cp $SRC/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ From ad34e58eed349a64418b4a251157d2a5ec4346fe Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Tue, 6 Jul 2021 00:47:19 +0200 Subject: [PATCH 10/10] We need to have information about ARCH in the desktop bsp package. This ain't universal. --- lib/desktop.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/desktop.sh b/lib/desktop.sh index 02980106954b..2bc594e39edd 100644 --- a/lib/desktop.sh +++ b/lib/desktop.sh @@ -142,13 +142,13 @@ create_bsp_desktop_package () cat <<-EOF > "${destination}"/DEBIAN/control Package: armbian-bsp-desktop-${BOARD} Version: $REVISION - Architecture: all + Architecture: $ARCH Maintainer: $MAINTAINER <$MAINTAINERMAIL> Installed-Size: 1 Section: xorg Priority: optional Provides: armbian-bsp-desktop, armbian-bsp-desktop-${BOARD} - Description: Armbian Board Specific Packages for desktop users using ${BOARD} machines + Description: Armbian Board Specific Packages for desktop users using $ARCH ${BOARD} machines EOF # Recreating the DEBIAN/postinst file