Skip to content

Commit

Permalink
build_rpi_debian_packages.sh: Separate build directory by arch
Browse files Browse the repository at this point in the history
  • Loading branch information
@popcornmix
popcornmix committed Aug 30, 2022
1 parent cfbda6f commit 06c89b6
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions build_rpi_debian_packages.sh
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
#!/bin/bash

ARCH=$(dpkg --print-architecture)
REPO_DIR=${REPO_DIR:-$(pwd)}
KODI_BUILD_DIR=${KODI_BUILD_DIR:-"${REPO_DIR}/build"}
KODI_BUILD_DIR=${KODI_BUILD_DIR:-"${REPO_DIR}/build_${ARCH}"}
ADDONS_TO_BUILD=${ADDONS_TO_BUILD:-""}
ADDONS_BUILD_DIR=${ADDONS_BUILD_DIR:-"${KODI_BUILD_DIR}/build/addons_build/"}
ADDONS_BUILD_DIR=${ADDONS_BUILD_DIR:-"${KODI_BUILD_DIR}/addons_build/"}
ADDONS_BUILD_NUMBER=${ADDONS_BUILD_NUMBER:-"1"}
#CPU=${CPU:-"cortex-a7"}
BUILD_TYPE=${BUILD_TYPE:-"Release"}
DEB_ARCH=${DEB_ARCH:-"armhf"}
DEB_ARCH=${DEB_ARCH:-${ARCH}}
DEB_PACK_VERSION=${DEB_PACK_VERSION:-"1"}
DEBUILD_OPTS=${DEBUILD_OPTS:-""}
BUILD_THREADS=$(( $(nproc)+2))
BUILD_THREADS=$(( $(nproc)*3/2 ))

function usage {
echo "$0: This script builds a Kodi debian package from a git repository optimized for Raspberry Pi 4.
Expand Down

4 comments on commit 06c89b6

@graysky2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@popcornmix - Can you please rebase against master and fix the build errors introduced by, I think, some commits made on Oct-05?

Complete build log.

[ 92%] Generating AddonModuleXbmcvfs.i.cpp
[ 92%] Building CXX object build/video/CMakeFiles/video.dir/VideoInfoScanner.cpp.o
/build/kodi-rpi-git/src/xbmc-7adbe0f2f1763927cccb506a5697c1dbc19ea494/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp: In member function ‘bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string&, bool)’:
/build/kodi-rpi-git/src/xbmc-7adbe0f2f1763927cccb506a5697c1dbc19ea494/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp:679:22: error: ‘StringUtils’ has not been declared
  679 |   std::string args = StringUtils::Format("video_size={}x{}:pix_fmt={}:time_base={}/{}:"
      |                      ^~~~~~~~~~~
[ 92%] Building CXX object build/interfaces/python/CMakeFiles/python_interface.dir/PyContext.cpp.o

@graysky2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, running git pull --rebase upstream 6a9ff760e906b174dea6db1caeb183ddc0527b2c on your branch builds successfully. The next few commits move the headers.

@popcornmix
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've rebased/updated the branch and added the missing include.

@graysky2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, it built fine. Cheers!

Please sign in to comment.