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

Cleanup and improve rpm generation #536

Merged
merged 7 commits into from
May 19, 2024
Merged

Cleanup and improve rpm generation #536

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4873d23
Cleanup and improve rpm generation
sharpenedblade May 18, 2024
0952cba
Address feedback
sharpenedblade May 19, 2024
cc2c72e
Fix file renaming
sharpenedblade May 19, 2024
9b7d090
Fix indent
sharpenedblade May 19, 2024
d9112b6
Reword instructions
sharpenedblade May 19, 2024
7796ee9
Use dnf instead of rpm
AdityaGarg8 May 19, 2024
31dafed
Fix indent
AdityaGarg8 May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions docs/tools/firmware.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ create_deb () {
}

create_rpm () {
if [ ! command -v rpmbuild &> /dev/null ]
if [ ! -f "/usr/local/bin/rpmbuild" ]
then
echo -e "\nrpm and/or its dependencies are missing!"
echo
Expand All @@ -124,8 +124,8 @@ create_rpm () {
then
nvramfile=$(ioreg -l | grep RequestedFiles | cut -d "/" -f 5 | rev | cut -c 4- | rev)
txcapblob=$(ioreg -l | grep RequestedFiles | cut -d "/" -f 3 | cut -d "\"" -f 1)
cp ${verbose} /usr/share/firmware/wifi/C-4364__s-B2/${nvramfile} "$HOME/rpmbuild/BUILD/brcmfmac4364b2-pcie.txt"
cp ${verbose} /usr/share/firmware/wifi/C-4364__s-B2/${txcapblob} "$HOME/rpmbuild/BUILD/brcmfmac4364b2-pcie.txcap_blob"
tar --append ${verbose} -f $HOME/rpmbuild/SOURCES/firmware.tar /usr/share/firmware/wifi/C-4364__s-B2/${nvramfile}
sharpenedblade marked this conversation as resolved.
Show resolved Hide resolved
tar --append ${verbose} -f $HOME/rpmbuild/SOURCES/firmware.tar /usr/share/firmware/wifi/C-4364__s-B2/${txcapblob}
fi

# Create the spec file
Expand All @@ -138,8 +138,6 @@ create_rpm () {
BuildArch: noarch
AdityaGarg8 marked this conversation as resolved.
Show resolved Hide resolved

Source1: firmware.tar
Source2: brcmfmac4364b2-pcie.txt
Source3: brcmfmac4364b2-pcie.txcap_blob

%description
Wi-Fi and Bluetooth firmware for T2 Macs
Expand All @@ -152,8 +150,6 @@ create_rpm () {
%install
mkdir -p %{buildroot}/usr/lib/firmware/brcm
install -m 644 * %{buildroot}/usr/lib/firmware/brcm
install -m 644 %{SOURCE2} %{buildroot}/usr/lib/firmware/brcm || true
install -m 644 %{SOURCE3} %{buildroot}/usr/lib/firmware/brcm || true

%posttrans
modprobe -r brcmfmac_wcc || true
Expand All @@ -171,16 +167,16 @@ create_rpm () {
then
rpmbuild -bb --define '_target_os linux' $HOME/rpmbuild/SPECS/apple-firmware.spec
else
rpmbuild -bb --define '_target_os linux' $HOME/rpmbuild/SPECS/apple-firmware.spec &>/dev/null || echo "Failed to make rpm package. Run the script with -v to get logs."
rpmbuild -bb --define '_target_os linux' $HOME/rpmbuild/SPECS/apple-firmware.spec >/dev/null 2>&1 || echo "Failed to make rpm package. Run the script with -v to get logs."
fi

# Copy and Cleanup
cp ${verbose} $HOME/rpmbuild/RPMS/noarch/*.rpm $HOME/Downloads
cp ${verbose} $HOME/rpmbuild/RPMS/noarch/apple-firmware-${ver}-1.noarch.rpm $HOME/Downloads
echo -e "\nCleaning up"
rm -r ${verbose} $HOME/rpmbuild

echo -e "\nRpm package apple-firmware-${ver}-1.noarch.rpm has been saved to Downloads!"
echo "Copy it to Linux and install it with \`sudo dnf install --disablerepo=* /path/to/file.rpm\`"
echo "Copy it to Linux and install it with \`sudo dnf install --disablerepo=* /path/to/apple-firmware-${ver}-1.noarch.rpm\`"
sharpenedblade marked this conversation as resolved.
Show resolved Hide resolved
}

create_arch_pkg () {
Expand Down