Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

targets/audio: Fetch last Makefile.am from git #4959

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+18 −1
Open

targets/audio: Fetch last Makefile.am from git #4959

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30e442c
targets/audio: Fetch last Makefile.am from git
drinkcat Apr 2, 2023
0d48e40
targets/audio: If include/ exists, extract it in cras/src/common
drinkcat Apr 2, 2023
80cc2e3
Write the makefile to the correct dir
dnschneid Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 18 additions & 1 deletion targets/audio
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ if tail -n 1 "$log" | grep -q "^Error"; then
fi
fi

# ChromiumOS >= 15378.0.0 removed autotools support (https://crrev.com/c/4322563),
# fetch the last known good Makefile.am. We can still patch it as required.
lastgoodam="c2ece09f69565afcbcf511b1693f3fe735bde511/cras/src/Makefile.am"
mkdir -p "$CRASBUILDTMP/cras/src"
wget "https://chromium.googlesource.com/chromiumos/third_party/adhd/+/${lastgoodam}?format=TEXT" -O- \
| base64 -d > "$CRASBUILDTMP/Makefile.am"


# Build CRAS ALSA plugin for the given architecture ($1)
# A blank parameter means we are building for the native architecture.
build_cras() {
Expand Down Expand Up @@ -112,11 +120,20 @@ build_cras() {
cd "$CRASBUILDTMP"

# Make sure we start fresh
rm -rf --one-file-system cras
rm -rf --one-file-system cras include

# Copy over prefetched Makefile.am, it'll get overriden if already present.
mkdir -p cras/src
cp Makefile.am cras/src/Makefile.am

# -m prevents "time stamp is in the future" spam
tar -xmf adhd.tar.gz cras/src

# If include/ exists, extract the content and move it to cras/src/common
if tar -xmf adhd.tar.gz include; then
mv include/*.h cras/src/common
fi

cd cras/src

# Create version file
Expand Down