diff --git a/build.sh b/build.sh index 4241bf9..6aad7b1 100755 --- a/build.sh +++ b/build.sh @@ -173,7 +173,6 @@ PATCHES="${BASE}/patches" SOURCES="${BASE}/sources" LOGFILE="build.log" PACKAGE_ARCH=$(dpkg-architecture -q DEB_BUILD_ARCH) -HOST_ARCH=$(dpkg-architecture -q DEB_HOST_ARCH) HOST_CPU=$(dpkg-architecture -q DEB_HOST_GNU_CPU) HOST_SYSTEM=$(dpkg-architecture -q DEB_HOST_GNU_SYSTEM) BUILD_PACKAGE="server" @@ -303,24 +302,24 @@ cd "${SOURCES}" if [ "${BUILD_PACKAGE}" != "client" ]; then PROXMOX_BIOME_VER="2.0.0-beta.6-2" PROXMOX_BIOME_GIT="0440df4eae11820e85892e35a52482b8cd72d800" # 2.0.0 - if [ ! -e "${PACKAGES_BUILD}/proxmox-biome_${PROXMOX_BIOME_VER}_${HOST_ARCH}.deb" ]; then + if [ ! -e "${PACKAGES_BUILD}/proxmox-biome_${PROXMOX_BIOME_VER}_${PACKAGE_ARCH}.deb" ]; then git_clone_or_fetch https://git.proxmox.com/git/proxmox-biome.git git_clean_and_checkout ${PROXMOX_BIOME_GIT} proxmox-biome patch -p1 -d proxmox-biome/ <"${PATCHES}/proxmox-biome-build.patch" - if [ "${HOST_ARCH}" = "arm64" ]; then + if [ "${PACKAGE_ARCH}" = "arm64" ]; then patch -p1 -d proxmox-biome/ <"${PATCHES}/proxmox-biome-arm.patch" fi cd proxmox-biome set_package_info - ${SUDO} apt -y build-dep . + ${SUDO} apt -y -a${PACKAGE_ARCH} build-dep . make deb - mv -f proxmox-biome_${PROXMOX_BIOME_VER}_${HOST_ARCH}.deb "${PACKAGES_BUILD}" + mv -f proxmox-biome_${PROXMOX_BIOME_VER}_${PACKAGE_ARCH}.deb "${PACKAGES_BUILD}" cd .. else echo "proxmox-biome up-to-date" fi - if [ -e "${PACKAGES_BUILD}/proxmox-biome_${PROXMOX_BIOME_VER}_${HOST_ARCH}.deb" ]; then - ${SUDO} apt install -y "${PACKAGES_BUILD}/proxmox-biome_${PROXMOX_BIOME_VER}_${HOST_ARCH}.deb" + if [ -e "${PACKAGES_BUILD}/proxmox-biome_${PROXMOX_BIOME_VER}_${PACKAGE_ARCH}.deb" ]; then + ${SUDO} apt install -y "${PACKAGES_BUILD}/proxmox-biome_${PROXMOX_BIOME_VER}_${PACKAGE_ARCH}.deb" else echo "proxmox-biome dependency missing" exit 1 diff --git a/patches/proxmox-biome-arm.patch b/patches/proxmox-biome-arm.patch index 13b01be..375f5ec 100644 --- a/patches/proxmox-biome-arm.patch +++ b/patches/proxmox-biome-arm.patch @@ -8,8 +8,8 @@ index 18e5ce27..d973b636 100644 -DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_amd64.deb -DEB_DBG=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_amd64.deb -+DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_HOST_ARCH).deb -+DEB_DBG=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_HOST_ARCH).deb ++DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_arm64.deb ++DEB_DBG=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_arm64.deb BUILDDIR=$(PACKAGE)-$(DEB_VERSION_UPSTREAM)