mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
linux-firmware: upgrade 20220509 -> 20220610
Drop 0001-Makefile-replace-mkdir-by-install.patch merged upstream. License-Update: additional files (From OE-Core rev: bcc5a22cd2b25c777315fe9d677fc0338ae2ab68) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 91cd99267157e860a108282aee13e162e8c10572) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
b7e0663dde
commit
dea39dd27e
@@ -1,84 +0,0 @@
|
|||||||
From 71514e74f35f2b51ca24062573d6d913525b30db Mon Sep 17 00:00:00 2001
|
|
||||||
From: Konrad Weihmann <kweihmann@outlook.com>
|
|
||||||
Date: Mon, 9 May 2022 12:57:57 +0200
|
|
||||||
Subject: [PATCH] Makefile: replace mkdir by install
|
|
||||||
|
|
||||||
mkdir -p creates paths that are bound to user's settings and therefore
|
|
||||||
can lead to different file mode bits of the base paths accross different
|
|
||||||
machines.
|
|
||||||
Use install instead, as this tool is not prone to such behavior.
|
|
||||||
|
|
||||||
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
|
|
||||||
Upstream-Status: Submitted [https://lore.kernel.org/linux-firmware/PR2PR09MB310088EA719E6D7CA5C268F1A8C69@PR2PR09MB3100.eurprd09.prod.outlook.com/]
|
|
||||||
---
|
|
||||||
Makefile | 2 +-
|
|
||||||
carl9170fw/toolchain/Makefile | 4 ++--
|
|
||||||
copy-firmware.sh | 6 +++---
|
|
||||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index e1c362f..83a0ec6 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -9,5 +9,5 @@ check:
|
|
||||||
@./check_whence.py
|
|
||||||
|
|
||||||
install:
|
|
||||||
- mkdir -p $(DESTDIR)$(FIRMWAREDIR)
|
|
||||||
+ install -d $(DESTDIR)$(FIRMWAREDIR)
|
|
||||||
./copy-firmware.sh $(DESTDIR)$(FIRMWAREDIR)
|
|
||||||
diff --git a/carl9170fw/toolchain/Makefile b/carl9170fw/toolchain/Makefile
|
|
||||||
index 2b25ffe..aaea8e8 100644
|
|
||||||
--- a/carl9170fw/toolchain/Makefile
|
|
||||||
+++ b/carl9170fw/toolchain/Makefile
|
|
||||||
@@ -46,14 +46,14 @@ src/gcc-$(GCC_VER): src/$(GCC_TAR) src/newlib-$(NEWLIB_VER)
|
|
||||||
ln -s $(BASEDIR)/src/newlib-$(NEWLIB_VER)/libgloss $@
|
|
||||||
|
|
||||||
binutils: src/binutils-$(BINUTILS_VER)
|
|
||||||
- mkdir -p build/binutils
|
|
||||||
+ install -d build/binutils
|
|
||||||
cd build/binutils; \
|
|
||||||
$(BASEDIR)/$</configure --target=sh-elf --prefix=$(BASEDIR)/inst; \
|
|
||||||
$(MAKE) -j3; \
|
|
||||||
$(MAKE) install
|
|
||||||
|
|
||||||
gcc: src/gcc-$(GCC_VER) binutils
|
|
||||||
- mkdir -p build/gcc
|
|
||||||
+ install -d build/gcc
|
|
||||||
cd build/gcc; \
|
|
||||||
$(BASEDIR)/$</configure --target=sh-elf --prefix=$(BASEDIR)/inst -enable-languages=c --without-pkgversion --with-newlib; \
|
|
||||||
$(MAKE) -j3; \
|
|
||||||
diff --git a/copy-firmware.sh b/copy-firmware.sh
|
|
||||||
index 9b46b63..bbacb92 100755
|
|
||||||
--- a/copy-firmware.sh
|
|
||||||
+++ b/copy-firmware.sh
|
|
||||||
@@ -34,7 +34,7 @@ done
|
|
||||||
grep '^File:' WHENCE | sed -e's/^File: *//g' -e's/"//g' | while read f; do
|
|
||||||
test -f "$f" || continue
|
|
||||||
$verbose "copying file $f"
|
|
||||||
- mkdir -p $destdir/$(dirname "$f")
|
|
||||||
+ install -d $destdir/$(dirname "$f")
|
|
||||||
cp -d "$f" $destdir/"$f"
|
|
||||||
done
|
|
||||||
|
|
||||||
@@ -42,7 +42,7 @@ grep -E '^Link:' WHENCE | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; d
|
|
||||||
if test -L "$f"; then
|
|
||||||
test -f "$destdir/$f" && continue
|
|
||||||
$verbose "copying link $f"
|
|
||||||
- mkdir -p $destdir/$(dirname "$f")
|
|
||||||
+ install -d $destdir/$(dirname "$f")
|
|
||||||
cp -d "$f" $destdir/"$f"
|
|
||||||
|
|
||||||
if test "x$d" != "x"; then
|
|
||||||
@@ -63,7 +63,7 @@ grep -E '^Link:' WHENCE | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; d
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
$verbose "creating link $f -> $d"
|
|
||||||
- mkdir -p $destdir/$(dirname "$f")
|
|
||||||
+ install -d $destdir/$(dirname "$f")
|
|
||||||
ln -sf "$d" "$destdir/$f"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
||||||
+2
-3
@@ -69,7 +69,7 @@ LICENSE = "\
|
|||||||
& WHENCE \
|
& WHENCE \
|
||||||
"
|
"
|
||||||
|
|
||||||
WHENCE_CHKSUM = "d3eb82686904888f8bbbe8d865371404"
|
WHENCE_CHKSUM = "385947b278a6646ae4c3d39ba8c9b1bb"
|
||||||
LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
|
LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
|
||||||
file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \
|
file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \
|
||||||
file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \
|
file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \
|
||||||
@@ -206,7 +206,6 @@ PE = "1"
|
|||||||
|
|
||||||
SRC_URI = "\
|
SRC_URI = "\
|
||||||
${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz \
|
${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz \
|
||||||
file://0001-Makefile-replace-mkdir-by-install.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
BBCLASSEXTEND = "devupstream:target"
|
BBCLASSEXTEND = "devupstream:target"
|
||||||
@@ -214,7 +213,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw
|
|||||||
# Pin this to the 20220509 release, override this in local.conf
|
# Pin this to the 20220509 release, override this in local.conf
|
||||||
SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae"
|
SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "376e0b3d7b4f8aaa2abf7f5ab74803dcf14b06b94e3d841b1467cd9a2848255e"
|
SRC_URI[sha256sum] = "faf3aedf89530e61f4fa1e8c7303dead9127cc24416945647797d079feb12837"
|
||||||
|
|
||||||
inherit allarch
|
inherit allarch
|
||||||
|
|
||||||
Reference in New Issue
Block a user