mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
media: fixes for bad mbox/unneeded patches media-edge and media-current - thanks to @schwar3kat
- fix bad mbox for same old patch - remove builddeb/mkdebian patches which are not needed in a-n
This commit is contained in:
Ricardo Pardini
@@ -1,20 +1,18 @@
|
||||
Below patch is a squash of following 4 commits borrowed from ayufan's
|
||||
https://github.com/ayufan-rock64/linux-mainline-kernel repo:
|
||||
|
||||
From cc22206776d61948f6984a4f03d8013eb4f92984 Mon Sep 17 00:00:00 2001
|
||||
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
|
||||
Date: Wed, 3 Dec 2014 13:23:28 +0200
|
||||
Subject: [PATCH] OF: DT-Overlay configfs interface
|
||||
|
||||
Below patch is a squash of 4 commits borrowed from ayufan's
|
||||
https://github.com/ayufan-rock64/linux-mainline-kernel repo:
|
||||
|
||||
This is a port of Pantelis Antoniou's v3 port that makes use of the
|
||||
new upstreamed configfs support for binary attributes.
|
||||
upstreamed configfs support for binary attributes.
|
||||
|
||||
Original commit message:
|
||||
|
||||
Add a runtime interface to using configfs for generic device tree overlay
|
||||
usage. With it its possible to use device tree overlays without having
|
||||
to use a per-platform overlay manager.
|
||||
|
||||
Please see Documentation/devicetree/configfs-overlays.txt for more info.
|
||||
|
||||
Changes since v2:
|
||||
@@ -25,51 +23,20 @@ Changes since v2:
|
||||
Changes since v1:
|
||||
- of_resolve() -> of_resolve_phandles().
|
||||
|
||||
Originally-signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
|
||||
Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
|
||||
DT configfs: Fix build errors on other platforms
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
|
||||
DT configfs: fix build error
|
||||
|
||||
There is an error when compiling rpi-4.6.y branch:
|
||||
CC drivers/of/configfs.o
|
||||
drivers/of/configfs.c:291:21: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
|
||||
.default_groups = of_cfs_def_groups,
|
||||
^
|
||||
drivers/of/configfs.c:291:21: note: (near initialization for 'of_cfs_subsys.su_group.default_groups.next')
|
||||
|
||||
The .default_groups is linked list since commit
|
||||
1ae1602de028acaa42a0f6ff18d19756f8e825c6.
|
||||
This commit uses configfs_add_default_group to fix this problem.
|
||||
|
||||
Change-Id: Id4903c9725ebc355aadd067bbc32047db622ce61
|
||||
Signed-off-by: Slawomir Stepien <sst@poczta.fm>
|
||||
|
||||
From 7cfb967c52d374ddcb0fc9194f38d1d5f9d8cdd8 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Sun, 3 Dec 2017 21:43:03 +0000
|
||||
Subject: [PATCH] configfs: New of_overlay API
|
||||
|
||||
From 8637321fabb045fe8617360ef1b058978b0d8457 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.org>
|
||||
Date: Mon, 4 Dec 2017 14:07:40 +0000
|
||||
Subject: [PATCH] SQUASH: config_fs: of_overlay_apply takes a pointer
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
|
||||
From 274dfabb947ca32116a429c582c74aaee6ff1b5b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
|
||||
Date: Mon, 14 May 2018 11:28:09 +0200
|
||||
Subject: [PATCH] ayufan: fix overlayfs to compile on 4.17 kernel
|
||||
|
||||
Change-Id: I421887697d2ba6e52aba9100100b7664760e2001
|
||||
---
|
||||
.../devicetree/configfs-overlays.txt | 31 ++
|
||||
drivers/of/Kconfig | 7 +
|
||||
drivers/of/Makefile | 1 +
|
||||
drivers/of/configfs.c | 290 ++++++++++++++++++
|
||||
4 files changed, 329 insertions(+)
|
||||
create mode 100644 Documentation/devicetree/configfs-overlays.txt
|
||||
create mode 100644 drivers/of/configfs.c
|
||||
|
||||
diff --git a/Documentation/devicetree/configfs-overlays.txt b/Documentation/devicetree/configfs-overlays.txt
|
||||
new file mode 100644
|
||||
index 0000000000000..5fa43e0643072
|
||||
index 000000000..5fa43e064
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/configfs-overlays.txt
|
||||
@@ -0,0 +1,31 @@
|
||||
@@ -105,11 +72,11 @@ index 0000000000000..5fa43e0643072
|
||||
+intended to be used by hardware managers in the kernel, while the copy interface
|
||||
+make sense for developers (since it avoids problems with namespaces).
|
||||
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
|
||||
index 37c2ccbefecdc..d3fc81a40c0e7 100644
|
||||
index 80b5fd44a..14c2ce96e 100644
|
||||
--- a/drivers/of/Kconfig
|
||||
+++ b/drivers/of/Kconfig
|
||||
@@ -103,4 +103,11 @@ config OF_OVERLAY
|
||||
config OF_NUMA
|
||||
@@ -94,4 +94,11 @@ config OF_DMA_DEFAULT_COHERENT
|
||||
# arches should select this if DMA is coherent by default for OF devices
|
||||
bool
|
||||
|
||||
+config OF_CONFIGFS
|
||||
@@ -121,7 +88,7 @@ index 37c2ccbefecdc..d3fc81a40c0e7 100644
|
||||
+
|
||||
endif # OF
|
||||
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
|
||||
index 663a4af0cccd5..b00a95adf5199 100644
|
||||
index e0360a443..90c92ced2 100644
|
||||
--- a/drivers/of/Makefile
|
||||
+++ b/drivers/of/Makefile
|
||||
@@ -1,6 +1,7 @@
|
||||
@@ -428,3 +395,6 @@ index 000000000..5dd509e8f
|
||||
+ return ret;
|
||||
+}
|
||||
+late_initcall(of_cfs_init);
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
--- a/scripts/package/builddeb
|
||||
+++ b/scripts/package/builddeb
|
||||
@@ -64,25 +64,6 @@
|
||||
chmod -R a+rX "$pdir"
|
||||
# in case we build in a setuid/setgid directory
|
||||
chmod -R ug-s "$pdir"
|
||||
-
|
||||
- # Create preinstall and post install script to remove dtb
|
||||
- if [ "$3" = "dtb" ]; then
|
||||
-
|
||||
- cat >> $pdir/DEBIAN/preinst <<- EOT
|
||||
- rm -rf /boot/dtb
|
||||
- rm -rf /boot/dtb-$version
|
||||
- exit 0
|
||||
- EOT
|
||||
-
|
||||
- cat >> $pdir/DEBIAN/postinst <<- EOT
|
||||
- cd /boot
|
||||
- ln -sfT dtb-$version dtb 2> /dev/null || mv dtb-$version dtb
|
||||
- exit 0
|
||||
- EOT
|
||||
-
|
||||
- chmod 775 $pdir/DEBIAN/preinst
|
||||
- chmod 775 $pdir/DEBIAN/postinst
|
||||
- fi
|
||||
|
||||
# Create postinst prerm script for headers
|
||||
if [ "$3" = "headers" ]; then
|
||||
@@ -194,10 +175,8 @@
|
||||
kernel_headers_dir="debian/hdrtmp"
|
||||
libc_headers_dir="debian/headertmp"
|
||||
dbg_dir="debian/dbgtmp"
|
||||
-dtb_dir="debian/dtbtmp"
|
||||
packagename=linux-image-"$BRANCH$LOCALVERSION"
|
||||
kernel_headers_packagename=linux-headers-"$BRANCH$LOCALVERSION"
|
||||
-dtb_packagename=linux-dtb-"$BRANCH$LOCALVERSION"
|
||||
libc_headers_packagename=linux-libc-dev
|
||||
dbg_packagename=$packagename-dbg
|
||||
|
||||
@@ -232,11 +211,9 @@
|
||||
BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes)
|
||||
|
||||
# Setup the directory structure
|
||||
-rm -rf "$tmpdir" "$dbg_dir" "$dtb_dir" debian/files
|
||||
+rm -rf "$tmpdir" "$dbg_dir" debian/files
|
||||
mkdir -m 755 -p "$tmpdir/DEBIAN"
|
||||
mkdir -p "$tmpdir/lib" "$tmpdir/boot"
|
||||
-mkdir -m 755 -p "$dtb_dir/DEBIAN"
|
||||
-mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
|
||||
mkdir -m 755 -p "$kernel_headers_dir/lib/modules/$version/"
|
||||
mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
|
||||
|
||||
@@ -256,13 +233,8 @@
|
||||
if is_enabled CONFIG_OF_EARLY_FLATTREE; then
|
||||
# Only some architectures with OF support have this target
|
||||
if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then
|
||||
- $MAKE -f $srctree/Makefile INSTALL_DTBS_PATH="$tmpdir/usr/lib/linux-image-$version" dtbs_install
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG; then
|
||||
- #mkdir -p "$tmpdir/boot/dtb"
|
||||
- INSTALL_DTBS_PATH="$dtb_dir/boot/dtb-$version" $MAKE KBUILD_SRC= dtbs_install
|
||||
+ $MAKE -f $srctree/Makefile INSTALL_DTBS_PATH="$tmpdir/boot/linux-image-$version" dtbs_install
|
||||
+ fi
|
||||
fi
|
||||
|
||||
if is_enabled CONFIG_MODULES; then
|
||||
@@ -325,6 +297,8 @@
|
||||
sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
|
||||
cat >> $tmpdir/DEBIAN/postinst <<- EOT
|
||||
ln -sf $(basename $installed_image_path) /boot/$image_name 2> /dev/null || cp /$installed_image_path /boot/$image_name
|
||||
+ cd /boot
|
||||
+ ln -sfT linux-image-$version dtb 2> /dev/null || cp linux-image-$version dtb
|
||||
touch /boot/.next
|
||||
exit 0
|
||||
EOT
|
||||
@@ -353,6 +327,10 @@
|
||||
rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
|
||||
fi
|
||||
}
|
||||
+# if [ -d /boot/dtb ]; then
|
||||
+ rm -rf /boot/dtb
|
||||
+ rm -rf /boot/linux-image-$version
|
||||
+# fi
|
||||
mountpoint -q /boot && check_boot_dev
|
||||
exit 0
|
||||
EOT
|
||||
@@ -360,11 +338,6 @@
|
||||
create_package "$packagename" "$tmpdir"
|
||||
|
||||
if [ "$ARCH" != "um" ]; then
|
||||
-
|
||||
- if [ "$(cat debian/arch)" != "amd64" ]; then # No DTB for amd64 target
|
||||
- create_package "$dtb_packagename" "$dtb_dir" "dtb"
|
||||
- fi
|
||||
-
|
||||
deploy_libc_headers $libc_headers_dir
|
||||
create_package $libc_headers_packagename $libc_headers_dir
|
||||
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
--- a/scripts/package/mkdebian
|
||||
+++ b/scripts/package/mkdebian
|
||||
@@ -98,7 +98,6 @@
|
||||
packagename=linux-image-"$BRANCH$LOCALVERSION"
|
||||
kernel_headers_packagename=linux-headers-"$BRANCH$LOCALVERSION"
|
||||
libc_headers_packagename=linux-libc-dev
|
||||
-dtb_packagename=linux-dtb-"$BRANCH$LOCALVERSION"
|
||||
dbg_packagename=$packagename-dbg
|
||||
|
||||
if [ "$ARCH" = "um" ] ; then
|
||||
@@ -199,12 +198,6 @@
|
||||
This package provides userspaces headers from the Linux kernel. These headers
|
||||
are used by the installed headers for GNU glibc and other system libraries.
|
||||
Multi-Arch: same
|
||||
-
|
||||
-Package: $dtb_packagename
|
||||
-Architecture: $debarch
|
||||
-Provides: linux-dtb, linux-dtb-armbian, armbian-$BRANCH
|
||||
-Description: Armbian Linux DTB, version $version $BRANCH
|
||||
- This package contains device blobs from the Linux kernel, version $version
|
||||
EOF
|
||||
|
||||
if is_enabled CONFIG_MODULES; then
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
Below patch is a squash of following 4 commits borrowed from ayufan's
|
||||
https://github.com/ayufan-rock64/linux-mainline-kernel repo:
|
||||
|
||||
From cc22206776d61948f6984a4f03d8013eb4f92984 Mon Sep 17 00:00:00 2001
|
||||
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
|
||||
Date: Wed, 3 Dec 2014 13:23:28 +0200
|
||||
Subject: [PATCH] OF: DT-Overlay configfs interface
|
||||
|
||||
Below patch is a squash of following 4 commits borrowed from ayufan's
|
||||
https://github.com/ayufan-rock64/linux-mainline-kernel repo:
|
||||
|
||||
This is a port of Pantelis Antoniou's v3 port that makes use of the
|
||||
new upstreamed configfs support for binary attributes.
|
||||
|
||||
@@ -45,28 +45,9 @@ The .default_groups is linked list since commit
|
||||
1ae1602de028acaa42a0f6ff18d19756f8e825c6.
|
||||
This commit uses configfs_add_default_group to fix this problem.
|
||||
|
||||
Change-Id: Id4903c9725ebc355aadd067bbc32047db622ce61
|
||||
Signed-off-by: Slawomir Stepien <sst@poczta.fm>
|
||||
|
||||
From 7cfb967c52d374ddcb0fc9194f38d1d5f9d8cdd8 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Sun, 3 Dec 2017 21:43:03 +0000
|
||||
Subject: [PATCH] configfs: New of_overlay API
|
||||
|
||||
From 8637321fabb045fe8617360ef1b058978b0d8457 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.org>
|
||||
Date: Mon, 4 Dec 2017 14:07:40 +0000
|
||||
Subject: [PATCH] SQUASH: config_fs: of_overlay_apply takes a pointer
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
|
||||
From 274dfabb947ca32116a429c582c74aaee6ff1b5b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
|
||||
Date: Mon, 14 May 2018 11:28:09 +0200
|
||||
Subject: [PATCH] ayufan: fix overlayfs to compile on 4.17 kernel
|
||||
|
||||
Change-Id: I421887697d2ba6e52aba9100100b7664760e2001
|
||||
|
||||
diff --git a/Documentation/devicetree/configfs-overlays.txt b/Documentation/devicetree/configfs-overlays.txt
|
||||
new file mode 100644
|
||||
index 0000000000000..5fa43e0643072
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
--- a/scripts/package/builddeb
|
||||
+++ b/scripts/package/builddeb
|
||||
@@ -64,25 +64,6 @@
|
||||
chmod -R a+rX "$pdir"
|
||||
# in case we build in a setuid/setgid directory
|
||||
chmod -R ug-s "$pdir"
|
||||
-
|
||||
- # Create preinstall and post install script to remove dtb
|
||||
- if [ "$3" = "dtb" ]; then
|
||||
-
|
||||
- cat >> $pdir/DEBIAN/preinst <<- EOT
|
||||
- rm -rf /boot/dtb
|
||||
- rm -rf /boot/dtb-$version
|
||||
- exit 0
|
||||
- EOT
|
||||
-
|
||||
- cat >> $pdir/DEBIAN/postinst <<- EOT
|
||||
- cd /boot
|
||||
- ln -sfT dtb-$version dtb 2> /dev/null || mv dtb-$version dtb
|
||||
- exit 0
|
||||
- EOT
|
||||
-
|
||||
- chmod 775 $pdir/DEBIAN/preinst
|
||||
- chmod 775 $pdir/DEBIAN/postinst
|
||||
- fi
|
||||
|
||||
# Create postinst prerm script for headers
|
||||
if [ "$3" = "headers" ]; then
|
||||
@@ -194,10 +175,8 @@
|
||||
kernel_headers_dir="debian/hdrtmp"
|
||||
libc_headers_dir="debian/headertmp"
|
||||
dbg_dir="debian/dbgtmp"
|
||||
-dtb_dir="debian/dtbtmp"
|
||||
packagename=linux-image-"$BRANCH$LOCALVERSION"
|
||||
kernel_headers_packagename=linux-headers-"$BRANCH$LOCALVERSION"
|
||||
-dtb_packagename=linux-dtb-"$BRANCH$LOCALVERSION"
|
||||
libc_headers_packagename=linux-libc-dev
|
||||
dbg_packagename=$packagename-dbg
|
||||
|
||||
@@ -232,11 +211,9 @@
|
||||
BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes)
|
||||
|
||||
# Setup the directory structure
|
||||
-rm -rf "$tmpdir" "$dbg_dir" "$dtb_dir" debian/files
|
||||
+rm -rf "$tmpdir" "$dbg_dir" debian/files
|
||||
mkdir -m 755 -p "$tmpdir/DEBIAN"
|
||||
mkdir -p "$tmpdir/lib" "$tmpdir/boot"
|
||||
-mkdir -m 755 -p "$dtb_dir/DEBIAN"
|
||||
-mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
|
||||
mkdir -m 755 -p "$kernel_headers_dir/lib/modules/$version/"
|
||||
mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
|
||||
|
||||
@@ -256,13 +233,8 @@
|
||||
if is_enabled CONFIG_OF_EARLY_FLATTREE; then
|
||||
# Only some architectures with OF support have this target
|
||||
if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then
|
||||
- $MAKE -f $srctree/Makefile INSTALL_DTBS_PATH="$tmpdir/usr/lib/linux-image-$version" dtbs_install
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG; then
|
||||
- #mkdir -p "$tmpdir/boot/dtb"
|
||||
- INSTALL_DTBS_PATH="$dtb_dir/boot/dtb-$version" $MAKE KBUILD_SRC= dtbs_install
|
||||
+ $MAKE -f $srctree/Makefile INSTALL_DTBS_PATH="$tmpdir/boot/linux-image-$version" dtbs_install
|
||||
+ fi
|
||||
fi
|
||||
|
||||
if is_enabled CONFIG_MODULES; then
|
||||
@@ -325,6 +297,8 @@
|
||||
sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
|
||||
cat >> $tmpdir/DEBIAN/postinst <<- EOT
|
||||
ln -sf $(basename $installed_image_path) /boot/$image_name 2> /dev/null || cp /$installed_image_path /boot/$image_name
|
||||
+ cd /boot
|
||||
+ ln -sfT linux-image-$version dtb 2> /dev/null || cp linux-image-$version dtb
|
||||
touch /boot/.next
|
||||
exit 0
|
||||
EOT
|
||||
@@ -353,6 +327,10 @@
|
||||
rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
|
||||
fi
|
||||
}
|
||||
+# if [ -d /boot/dtb ]; then
|
||||
+ rm -rf /boot/dtb
|
||||
+ rm -rf /boot/linux-image-$version
|
||||
+# fi
|
||||
mountpoint -q /boot && check_boot_dev
|
||||
exit 0
|
||||
EOT
|
||||
@@ -360,11 +338,6 @@
|
||||
create_package "$packagename" "$tmpdir"
|
||||
|
||||
if [ "$ARCH" != "um" ]; then
|
||||
-
|
||||
- if [ "$(cat debian/arch)" != "amd64" ]; then # No DTB for amd64 target
|
||||
- create_package "$dtb_packagename" "$dtb_dir" "dtb"
|
||||
- fi
|
||||
-
|
||||
deploy_libc_headers $libc_headers_dir
|
||||
create_package $libc_headers_packagename $libc_headers_dir
|
||||
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
--- a/scripts/package/mkdebian
|
||||
+++ b/scripts/package/mkdebian
|
||||
@@ -98,7 +98,6 @@
|
||||
packagename=linux-image-"$BRANCH$LOCALVERSION"
|
||||
kernel_headers_packagename=linux-headers-"$BRANCH$LOCALVERSION"
|
||||
libc_headers_packagename=linux-libc-dev
|
||||
-dtb_packagename=linux-dtb-"$BRANCH$LOCALVERSION"
|
||||
dbg_packagename=$packagename-dbg
|
||||
|
||||
if [ "$ARCH" = "um" ] ; then
|
||||
@@ -199,12 +198,6 @@
|
||||
This package provides userspaces headers from the Linux kernel. These headers
|
||||
are used by the installed headers for GNU glibc and other system libraries.
|
||||
Multi-Arch: same
|
||||
-
|
||||
-Package: $dtb_packagename
|
||||
-Architecture: $debarch
|
||||
-Provides: linux-dtb, linux-dtb-armbian, armbian-$BRANCH
|
||||
-Description: Armbian Linux DTB, version $version $BRANCH
|
||||
- This package contains device blobs from the Linux kernel, version $version
|
||||
EOF
|
||||
|
||||
if is_enabled CONFIG_MODULES; then
|
||||
|
||||
Reference in New Issue
Block a user