From d1f5e0561389b4a400da83e6d36b312d2c1a2f02 Mon Sep 17 00:00:00 2001 From: ZHANG Yuntian <95260730+RadxaYuntian@users.noreply.github.com> Date: Mon, 16 Oct 2023 20:03:03 +0800 Subject: [PATCH] u-boot: allow another profile to become the default --- lib/u-boot.sh | 11 +++++++++++ u-boot/rknext/fork.conf | 1 + 2 files changed, 12 insertions(+) diff --git a/lib/u-boot.sh b/lib/u-boot.sh index d93f898c..e4030864 100644 --- a/lib/u-boot.sh +++ b/lib/u-boot.sh @@ -5,6 +5,7 @@ bsp_reset() { BSP_COMMIT= BSP_BRANCH= BSP_DEFCONFIG= + BSP_REPLACES= BSP_MAKE_DEFINES=() BSP_MAKE_TARGETS=("all") @@ -225,9 +226,19 @@ bsp_makedeb() { local VERSION="$(bsp_version)-${PKG_REVISION}${SOURCE_GITREV:+-$SOURCE_GITREV}" local URL="https://github.com/radxa-pkg/$NAME" local DESCRIPTION="Radxa U-Boot image for $FORK" + local REPLACES=() + if [[ -n "$BSP_REPLACES" ]] + then + REPLACES+=( + "--provides" "u-boot-$BSP_REPLACES" + "--conflicts" "u-boot-$BSP_REPLACES" + "--replaces" "u-boot-$BSP_REPLACES" + ) + fi fpm -s dir -t deb -n "$NAME" -v "$VERSION" \ --deb-compression xz \ -a arm64 \ + "${REPLACES[@]}" \ --url "$URL" \ --description "$DESCRIPTION" \ --license "GPL-2+" \ diff --git a/u-boot/rknext/fork.conf b/u-boot/rknext/fork.conf index 34cd96ea..8ed0f171 100644 --- a/u-boot/rknext/fork.conf +++ b/u-boot/rknext/fork.conf @@ -1,6 +1,7 @@ BSP_GIT="https://github.com/radxa/u-boot.git" BSP_BRANCH="next-dev" BSP_MAKE_TARGETS=("u-boot.dtb" "u-boot.itb" "all") +BSP_REPLACES=("rk3588") SUPPORTED_BOARDS=( "rock-pi-e" "rock-5a" "rock-5b" "radxa-nx5-io"