Skip to content

Commit

Permalink
Move 32 bits patches under their own ArchFamily directory
Browse files Browse the repository at this point in the history
This way aarch64 will finally compile without applying unnecessary patches.
Right now, the only patches that will be applied in every case are the
lonely lldb clang3.8 patch and the backported -j feature patch.

From now on, patches needed only on arm32 will always be in a aarch32 subdirectory.
Only patches needed everywhere will go directly into the main *.diffs directory.
  • Loading branch information
uraimo committed Sep 6, 2019
1 parent 056a631 commit a36068f
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions checkoutRelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,16 @@ echo "✅ Applying the required cross-platform patches..."
find . -maxdepth 1 -type d \( ! -name . \) -exec bash -c "[ -d '{}'.diffs ] && echo ■ Applying patches to '{}' && cd '{}' && for f in ../'{}'.diffs/*.diff; do [ -e \"\$f\" ] || continue; patch -p1 < \"\$f\"; done;" \;


# Patches for a specific arch, OS, shared version(debian and raspbian can share patches)
# and OS version go in their own subdirectory
# Patches for a specific arch, arch family, OS, shared version(debian and raspbian can share patches)
# and OS version go in their own subdirectory.
# To sum up, under every project-specific *.diffs directory you'll be able to group you patches this way:
# * $ARCHFAMILY/ : aarch32 for the generic arm32 patches and aarch64 for the 64bit-specific ones
# * $ARCH/ : aarch64,armv6,armv7 specific patches, regardless of the OS
# * $OS/ : Regardless of the architecture, patches for a specific OS
# * $VERSION/ : Patches for a specific OS version, regardless of the actual OS name (Debian and Raspbian can both be "Stretch" and the same version of Ubuntu could be reporting a different name when asked)
# * $OS$VERSION/ : Patches for a very specific version of a distribution
# * $ARCH$OS$VERSION/ : Patches that apply only to an OS/Version on a specific architecture.
#
for VARIANT in $ARCH $ARCHFAMILY $OS $VERSION $OS$VERSION $ARCH$OS$VERSION
do
echo "✳️ Searching for required $VARIANT patches..."
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit a36068f

Please sign in to comment.