Skip to content

Commit

Permalink
Renaming the BSP package to armbian-bsp
Browse files Browse the repository at this point in the history 
Extracted from #2776
  • Loading branch information
@igorpecovnik
igorpecovnik committed Apr 17, 2021
1 parent 9a21111 commit cd684cf
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
2 changes: 1 addition & 1 deletion lib/distributions.sh
View file
Expand Up @@ -292,7 +292,7 @@ install_common()

# install board support packages
if [[ "${REPOSITORY_INSTALL}" != *bsp* ]]; then
install_deb_chroot "${DEB_STORAGE}/$RELEASE/${CHOSEN_ROOTFS}_${REVISION}_${ARCH}.deb" >> "${DEST}"/debug/install.log 2>&1
install_deb_chroot "${DEB_STORAGE}/$RELEASE/${BSP_CLI_PACKAGE_FULLNAME}.deb" >> "${DEST}"/debug/install.log 2>&1
else
install_deb_chroot "${CHOSEN_ROOTFS}" "remote"
fi
Expand Down
6 changes: 4 additions & 2 deletions lib/main.sh
View file
Expand Up @@ -392,13 +392,15 @@ BOOTSOURCEDIR="${BOOTDIR}/$(branch2dir "${BOOTBRANCH}")"
LINUXSOURCEDIR="${KERNELDIR}/$(branch2dir "${KERNELBRANCH}")"
[[ -n $ATFSOURCE ]] && ATFSOURCEDIR="${ATFDIR}/$(branch2dir "${ATFBRANCH}")"

BSP_CLI_PACKAGE_NAME="armbian-bsp-cli-${BOARD}"
BSP_CLI_PACKAGE_FULLNAME="${BSP_CLI_PACKAGE_NAME}_${ARCH}"
# define package names
DEB_BRANCH=${BRANCH//default}
# if not empty, append hyphen
DEB_BRANCH=${DEB_BRANCH:+${DEB_BRANCH}-}
CHOSEN_UBOOT=linux-u-boot-${DEB_BRANCH}${BOARD}
CHOSEN_KERNEL=linux-image-${DEB_BRANCH}${LINUXFAMILY}
CHOSEN_ROOTFS=linux-${RELEASE}-root-${DEB_BRANCH}${BOARD}
CHOSEN_ROOTFS=${BSP_CLI_PACKAGE_NAME}
CHOSEN_DESKTOP=armbian-${RELEASE}-desktop-${DESKTOP_ENVIRONMENT}
CHOSEN_KSRC=linux-source-${BRANCH}-${LINUXFAMILY}

Expand Down Expand Up @@ -492,7 +494,7 @@ fi
overlayfs_wrapper "cleanup"

# create board support package
[[ -n $RELEASE && ! -f ${DEB_STORAGE}/$RELEASE/${CHOSEN_ROOTFS}_${REVISION}_${ARCH}.deb ]] && create_board_package
[[ -n $RELEASE && ! -f ${DEB_STORAGE}/$RELEASE/${BSP_CLI_PACKAGE_FULLNAME}.deb ]] && create_board_package

# create desktop package
[[ -n $RELEASE && $DESKTOP_ENVIRONMENT && ! -f ${DEB_STORAGE}/$RELEASE/${CHOSEN_DESKTOP}_${REVISION}_all.deb ]] && create_desktop_package
Expand Down
19 changes: 13 additions & 6 deletions lib/makeboarddeb.sh
View file
Expand Up @@ -20,7 +20,7 @@ create_board_package()
bsptempdir=$(mktemp -d)
chmod 700 ${bsptempdir}
trap "rm -rf \"${bsptempdir}\" ; exit 0" 0 1 2 3 15
local destination=${bsptempdir}/${RELEASE}/${CHOSEN_ROOTFS}_${REVISION}_${ARCH}
local destination=${bsptempdir}/${RELEASE}/${BSP_CLI_PACKAGE_FULLNAME}
mkdir -p "${destination}"/DEBIAN
cd $destination

Expand Down Expand Up @@ -50,7 +50,7 @@ create_board_package()
# Depends: linux-base is needed for "linux-version" command in initrd cleanup script
# Depends: fping is needed for armbianmonitor to upload armbian-hardware-monitor.log
cat <<-EOF > "${destination}"/DEBIAN/control
Package: linux-${RELEASE}-root-${DEB_BRANCH}${BOARD}
Package: ${BSP_CLI_PACKAGE_NAME}
Version: $REVISION
Architecture: $ARCH
Maintainer: $MAINTAINER <$MAINTAINERMAIL>
Expand All @@ -61,9 +61,16 @@ create_board_package()
Provides: armbian-bsp
Conflicts: armbian-bsp
Suggests: armbian-config
Replaces: zram-config, base-files, armbian-tools-$RELEASE
Replaces: zram-config, base-files, armbian-tools-$RELEASE, \
linux-xenial-root-legacy-$BOARD, linux-xenial-root-current-$BOARD, linux-xenial-root-edge-$BOARD, \
linux-bionic-root-legacy-$BOARD, linux-bionic-root-current-$BOARD, linux-bionic-root-edge-$BOARD, \
linux-focal-root-legacy-$BOARD, linux-focal-root-current-$BOARD, linux-focal-root-edge-$BOARD, \
linux-stretch-root-legacy-$BOARD, linux-stretch-root-current-$BOARD, linux-stretch-root-edge-$BOARD, \
linux-buster-root-legacy-$BOARD, linux-buster-root-current-$BOARD, linux-buster-root-edge-$BOARD, \
linux-bullseye-root-legacy-$BOARD, linux-bullseye-root-current-$BOARD, linux-bullseye-root-edge-$BOARD, \
linux-hirsute-root-legacy-$BOARD, linux-hirsute-root-current-$BOARD, linux-hirsute-root-edge-$BOARD
Recommends: bsdutils, parted, util-linux, toilet
Description: Armbian tweaks for $RELEASE on $BOARD ($BRANCH branch)
Description: Armbian tweaks for $BOARD
EOF

# set up pre install script
Expand Down Expand Up @@ -124,7 +131,7 @@ create_board_package()
[ -f "/usr/lib/armbian/firstrun-config.sh" ] && rm /usr/lib/armbian/firstrun-config.sh
# fix for https://bugs.launchpad.net/ubuntu/+source/lightdm-gtk-greeter/+bug/1897491
[ -d "/var/lib/lightdm" ] && (chown -R lightdm:lightdm /var/lib/lightdm ; chmod 0750 /var/lib/lightdm)
dpkg-divert --quiet --package linux-${RELEASE}-root-${DEB_BRANCH}${BOARD} --add --rename --divert /etc/mpv/mpv-dist.conf /etc/mpv/mpv.conf
dpkg-divert --quiet --package ${BSP_CLI_PACKAGE_NAME} --add --rename --divert /etc/mpv/mpv-dist.conf /etc/mpv/mpv.conf
exit 0
EOF

Expand All @@ -135,7 +142,7 @@ create_board_package()
#!/bin/sh
if [ remove = "\$1" ] || [ abort-install = "\$1" ]; then
dpkg-divert --quiet --package linux-${RELEASE}-root-${DEB_BRANCH}${BOARD} --remove --rename --divert /etc/mpv/mpv-dist.conf /etc/mpv/mpv.conf
dpkg-divert --quiet --package ${BSP_CLI_PACKAGE_NAME} --remove --rename --divert /etc/mpv/mpv-dist.conf /etc/mpv/mpv.conf
systemctl disable armbian-hardware-monitor.service armbian-hardware-optimize.service >/dev/null 2>&1
systemctl disable armbian-zram-config.service armbian-ramlog.service >/dev/null 2>&1
Expand Down

0 comments on commit cd684cf

Please sign in to comment.