NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
A number of merge conflicts, but hopefully they are all sorted out now.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2020-09-02 18:07:52 +02:00
commit c287d789b7
352 changed files with 10966 additions and 4344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Config.in.legacy
View File

@ -144,6 +144,33 @@ endif
###############################################################################
comment "Legacy options removed in 2020.11"
config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
bool "X.org Enable AIGLX Extension"
select BR2_LEGACY
help
AIGLX Extension was removed in X.org X server version 1.19.0
config BR2_PACKAGE_AMD_CATALYST
bool "amd-catalyst"
select BR2_LEGACY
help
Current X.org server is incompatible with this driver.
config BR2_PACKAGE_NVIDIA_TEGRA23
bool "nvidia-tegra23 package removed"
select BR2_LEGACY
help
Current X.org server is incompatible with this driver.
config BR2_GDB_VERSION_8_1
bool "gdb 8.1.x has been removed"
select BR2_LEGACY
help
The 8.1.x version of gdb has been removed. Use a newer
version instead.
comment "Legacy options removed in 2020.08"
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64
@ -1086,13 +1113,6 @@ config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT
BR2_PACKAGE_DOCKER_CLI_STATIC, following the package split of
docker-engine and docker-cli.
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
bool "Modular X.org server was updated to version 1.20.0"
select BR2_LEGACY
select BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
help
Modular X.org server was updated to version 1.20.0
config BR2_PACKAGE_XPROTO_APPLEWMPROTO
bool "xproto-applewmproto package replaced by xorgproto"
select BR2_LEGACY

26
DEVELOPERS
View File

@ -44,6 +44,8 @@ F: package/imx-usb-loader/
F: package/janus-gateway/
F: package/json-for-modern-cpp/
F: package/libabseil-cpp/
F: package/libblockdev/
F: package/libbytesize/
F: package/libcpprestsdk/
F: package/libcutl/
F: package/libodb/
@ -116,6 +118,9 @@ N: Adrien Gallouët <adrien@gallouet.fr>
F: package/bird/
F: package/glorytun/
N: Alejandro González <alejandro.gonzalez.correo@gmail.com>
F: package/watchdog/
N: Aleksander Morgado <aleksander@aleksander.es>
F: package/libmbim/
F: package/libqmi/
@ -629,6 +634,9 @@ N: Cyril Bur <cyrilbur@gmail.com>
F: arch/Config.in.powerpc
F: package/kvm-unit-tests
N: Dagg Stompler <daggs@gmx.com>
F: package/meson-tools/
N: Daniel J. Leach <dleach@belcan.com>
F: package/dacapo/
@ -1094,6 +1102,7 @@ F: package/python-cheetah/
F: package/python-markdown/
F: package/python-remi/
F: package/python-sip/
F: package/uhd/
N: Heiko Thiery <heiko.thiery@gmail.com>
F: package/ipmitool/
@ -1111,6 +1120,9 @@ F: package/gauche/
F: package/gmrender-resurrect/
F: package/squeezelite/
N: Horatiu Vultur <horatiu.vultur@microchip.com>
F: package/easyframes/
N: Ian Haylock <haylocki@yahoo.co.uk>
F: package/python-rpi-gpio/
@ -1598,6 +1610,8 @@ F: package/lua-stdlib/
F: package/luaossl/
F: package/murata-cyw-fw/
F: package/netdata/
F: package/python-ansicolors/
F: package/python-packaging/
F: package/rs485conf/
F: package/turbolua/
F: support/testing/tests/package/test_netdata.py
@ -1824,6 +1838,9 @@ N: Michael Fischer <mf@go-sys.de>
F: package/gnuplot/
F: package/sdl2/
N: Michael Nosthoff <buildroot@heine.tech>
F: package/re2/
N: Michael Rommel <rommel@layer-7.net>
F: package/knock/
F: package/python-crc16/
@ -1897,8 +1914,6 @@ F: package/libgit2/
N: Nicolas Serafini <nicolas.serafini@sensefly.com>
F: package/exiv2/
F: package/nvidia-tegra23/nvidia-tegra23-binaries/
F: package/nvidia-tegra23/nvidia-tegra23-codecs/
F: package/ofono/
N: Nikolay Dimitrov <nikolay.dimitrov@retrohub.org>
@ -2053,6 +2068,7 @@ F: package/gstreamer1/gst1-validate/
F: package/gstreamer1/gstreamer1-editing-services/
F: package/iwd/
F: package/libevdev/
F: package/libuev/
F: package/log4cplus/
F: package/postgresql/
F: package/python-colorzero/
@ -2060,6 +2076,9 @@ F: package/python-gpiozero/
F: package/qt5/
F: package/quotatool/
F: package/racehound/
F: package/redir/
F: package/uredir/
F: package/wayland-utils/
N: Peter Thompson <peter.macleod.thompson@gmail.com>
F: package/sdl2_gfx/
@ -2433,9 +2452,11 @@ F: package/powertop/
N: Suniel Mahesh <sunil@amarulasolutions.com>
F: board/firefly/
F: board/radxa/rockpi-4
F: board/radxa/rockpi-n8
F: board/radxa/rockpi-n10
F: configs/roc_pc_rk3399_defconfig
F: configs/rock_pi_4_defconfig
F: configs/rock_pi_n8_defconfig
F: configs/rock_pi_n10_defconfig
F: package/arm-gnu-a-toolchain/
@ -2584,6 +2605,7 @@ F: package/tstools/
N: Vadim Kochan <vadim4j@gmail.com>
F: package/brcm-patchram-plus/
F: package/frr/
F: package/gettext-tiny/
F: package/tinyssh/

9
Makefile
View File

@ -125,7 +125,7 @@ endif
noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
defconfig %_defconfig allyesconfig allnoconfig alldefconfig syncconfig release \
randpackageconfig allyespackageconfig allnopackageconfig \
print-version olddefconfig distclean manual manual-% check-package
print-version olddefconfig distclean manual manual-% check-package check-flake8
# Some global targets do not trigger a build, but are used to collect
# metadata, or do various checks. When such targets are triggered,
@ -1208,6 +1208,13 @@ release:
print-version:
@echo $(BR2_VERSION_FULL)
check-flake8:
$(Q)git ls-tree -r --name-only HEAD \
| xargs file \
| grep 'Python script' \
| cut -d':' -f1 \
| xargs -- python3 -m flake8 --statistics --max-line-length=132
check-package:
find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) \
-exec ./utils/check-package {} +

4
board/radxa/rockpi-n8/extlinux.conf Normal file
View File

@ -0,0 +1,4 @@
label RK3288_ROCKPI_N8 linux
kernel /zImage
devicetree /rk3288-rock-pi-n8.dtb
append console=ttyS2,115200n8 root=/dev/mmcblk0p4 rw rootwait

39
board/radxa/rockpi-n8/genimage.cfg Normal file
View File

@ -0,0 +1,39 @@
image boot.vfat {
vfat {
files = {
"zImage",
"rk3288-rock-pi-n8.dtb",
"extlinux"
}
}
size = 16M
}
image sdcard.img {
hdimage {
gpt = true
}
partition loader1 {
image = "idbloader.img"
offset = 32K
}
partition loader2 {
image = "u-boot-dtb.img"
offset = 8M
}
partition boot {
partition-type = 0xC
bootable = "true"
image = "boot.vfat"
offset = 16M
}
partition rootfs {
partition-type = 0x83
image = "rootfs.ext4"
}
}

5
board/radxa/rockpi-n8/post-build.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
BOARD_DIR="$(dirname $0)"
install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf

61
board/radxa/rockpi-n8/readme.txt Normal file
View File

@ -0,0 +1,61 @@
RADXA ROCKPI-N8
================
https://wiki.radxa.com/RockpiN8
Build:
======
$ make rock_pi_n8_defconfig
$ make
Files created in output directory
=================================
output/images
.
├── boot.vfat
├── extlinux
├── idbloader.img
├── rk3288-rock-pi-n8.dtb
├── rootfs.ext2
├── rootfs.ext4 -> rootfs.ext2
├── rootfs.tar
├── sdcard.img
├── u-boot.bin
├── u-boot-dtb.bin
├── u-boot-dtb.img
└── zImage
Creating bootable SD card:
==========================
Simply invoke (as root)
sudo dd if=output/images/sdcard.img of=/dev/sdX && sync
Where X is your SD card device.
Booting:
========
Serial console:
---------------
RockPi-N8 has a 40-pin GPIO header. The pin layout is as follows:
pin 6: gnd
pin 8: tx
pin 10: rx
Baudrate for this board is 115200.
The boot order on rockpi-n8 is emmc, sd. If emmc contains a valid Image, the board
always boots from emmc. To boot from SD, erase emmc as per the guide:
https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html
Login:
------
Enter 'root' as login user, and the prompt is ready.
wiki link:
----------
https://wiki.amarulasolutions.com/bsp/rockchip/rk3288/rock-pi-n8.html

10
board/roseapplepi/genimage.cfg
View File

@ -7,10 +7,10 @@ image boot.vfat {
"uImage"
}
file kernel.dtb {
image = "actduino_bubble_gum_sdboot_linux.dtb"
image = "owl-s500-roseapplepi.dtb"
}
}
size = 10M
size = 128M
}
image sdcard.img {
@ -34,10 +34,4 @@ image sdcard.img {
bootable = "true"
image = "boot.vfat"
}
partition rootfs {
partition-type = 0x83
image = "rootfs.ext4"
size = 512M
}
}

45
board/roseapplepi/linux.config Normal file
View File

@ -0,0 +1,45 @@
# CONFIG_SWAP is not set
# CONFIG_CROSS_MEMORY_ATTACH is not set
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
# CONFIG_CPU_ISOLATION is not set
# CONFIG_KALLSYMS is not set
# CONFIG_RSEQ is not set
CONFIG_EMBEDDED=y
# CONFIG_SLUB_DEBUG is not set
# CONFIG_COMPAT_BRK is not set
CONFIG_ARCH_ACTIONS=y
CONFIG_SMP=y
CONFIG_ARM_PSCI=y
CONFIG_HIGHMEM=y
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_SUSPEND is not set
# CONFIG_STACKPROTECTOR is not set
# CONFIG_MQ_IOSCHED_KYBER is not set
# CONFIG_COREDUMP is not set
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
# CONFIG_INET_DIAG is not set
# CONFIG_IPV6 is not set
# CONFIG_WIRELESS is not set
# CONFIG_ETHTOOL_NETLINK is not set
# CONFIG_VT is not set
CONFIG_SERIAL_OWL=y
# CONFIG_HW_RANDOM is not set
# CONFIG_HID is not set
# CONFIG_USB_SUPPORT is not set
# CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT4_FS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_MISC_FILESYSTEMS is not set
# CONFIG_NETWORK_FILESYSTEMS is not set
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
# CONFIG_CRYPTO_HW is not set
# CONFIG_FTRACE is not set
# CONFIG_RUNTIME_TESTING_MENU is not set

52
board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch Normal file
View File

@ -0,0 +1,52 @@
From: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
Subject: [PATCH 1/4] arm: dts: owl-s500: Fix incorrect PPI interrupt specifiers
To: Rob Herring <robh+dt@kernel.org>,
Andreas Färber <afaerber@suse.de>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Date: Mon, 15 Jun 2020 03:19:08 +0300 (10 weeks, 3 days, 20 hours ago)
X-Mailer: git-send-email 2.27.0
The PPI interrupts for cortex-a9 were incorrectly specified, fix them.
Fixes: fdfe7f4f9d85 ("ARM: dts: Add Actions Semi S500 and LeMaker Guitar")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
arch/arm/boot/dts/owl-s500.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/owl-s500.dtsi b/arch/arm/boot/dts/owl-s500.dtsi
index 5ceb6cc4451d..1dbe4e8b38ac 100644
--- a/arch/arm/boot/dts/owl-s500.dtsi
+++ b/arch/arm/boot/dts/owl-s500.dtsi
@@ -84,21 +84,21 @@ scu: scu@b0020000 {
global_timer: timer@b0020200 {
compatible = "arm,cortex-a9-global-timer";
reg = <0xb0020200 0x100>;
- interrupts = <GIC_PPI 0 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
+ interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
status = "disabled";
};
twd_timer: timer@b0020600 {
compatible = "arm,cortex-a9-twd-timer";
reg = <0xb0020600 0x20>;
- interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
+ interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
status = "disabled";
};
twd_wdt: wdt@b0020620 {
compatible = "arm,cortex-a9-twd-wdt";
reg = <0xb0020620 0xe0>;
- interrupts = <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
+ interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
status = "disabled";
};
--
2.27.0

31
board/roseapplepi/patches/linux/0001-unbreak-xhci-trace.patch
View File

@ -1,31 +0,0 @@
[PATCH] unbreak xhci-trace compilation
When commit 84a99f6fc5d4 (xhci: add traces for debug messages in
xhci_address_device) was backported to the owl tree as part of commit
5b2ea66f15396 (usb: add owl usb driver), the specific CFLAGS needed for
xhci-trace.c were missed, causing build breakage:
CC drivers/usb/host/xhci-trace.o
In file included from drivers/usb/host/xhci-trace.h:151:0,
from drivers/usb/host/xhci-trace.c:15:
include/trace/define_trace.h:79:43: fatal error: ./xhci-trace.h: No such file or directory
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
drivers/usb/host/Makefile | 3 +++
1 file changed, 3 insertions(+)
Index: linux-59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b/drivers/usb/host/Makefile
===================================================================
--- linux-59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b.orig/drivers/usb/host/Makefile
+++ linux-59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b/drivers/usb/host/Makefile
@@ -4,6 +4,9 @@
ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
+# tell define_trace.h where to find the xhci trace header
+CFLAGS_xhci-trace.o := -I$(src)
+
isp1760-y := isp1760-hcd.o isp1760-if.o
fhci-y := fhci-hcd.o fhci-hub.o fhci-q.o

89
board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch Normal file
View File

@ -0,0 +1,89 @@
From: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
Subject: [PATCH 4/4] arm: dts: owl-s500: Add RoseapplePi
To: Rob Herring <robh+dt@kernel.org>,
Andreas Färber <afaerber@suse.de>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Date: Mon, 15 Jun 2020 03:19:11 +0300 (10 weeks, 3 days, 20 hours ago)
X-Mailer: git-send-email 2.27.0
Add a Device Tree for the RoseapplePi SBC.
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/owl-s500-roseapplepi.dts | 47 ++++++++++++++++++++++
2 files changed, 48 insertions(+)
create mode 100644 arch/arm/boot/dts/owl-s500-roseapplepi.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e8dd99201397..d0712e7275da 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -856,6 +856,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
dtb-$(CONFIG_ARCH_ACTIONS) += \
owl-s500-cubieboard6.dtb \
owl-s500-guitar-bb-rev-b.dtb \
+ owl-s500-roseapplepi.dtb \
owl-s500-sparky.dtb
dtb-$(CONFIG_ARCH_PRIMA2) += \
prima2-evb.dtb
diff --git a/arch/arm/boot/dts/owl-s500-roseapplepi.dts b/arch/arm/boot/dts/owl-s500-roseapplepi.dts
new file mode 100644
index 000000000000..c61fbaa3821e
--- /dev/null
+++ b/arch/arm/boot/dts/owl-s500-roseapplepi.dts
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Roseapple Pi
+ *
+ * Copyright (c) 2020 Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
+ */
+
+/dts-v1/;
+
+#include "owl-s500.dtsi"
+
+/ {
+ compatible = "roseapplepi,roseapplepi", "actions,s500";
+ model = "Roseapple Pi";
+
+ aliases {
+ serial2 = &uart2;
+ };
+
+ chosen {
+ stdout-path = "serial2:115200n8";
+ };
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x80000000>; /* 2GB */
+ };
+
+ uart2_clk: uart2-clk {
+ compatible = "fixed-clock";
+ clock-frequency = <921600>;
+ #clock-cells = <0>;
+ };
+};
+
+&twd_timer {
+ status = "okay";
+};
+
+&timer {
+ clocks = <&hosc>;
+};
+
+&uart2 {
+ status = "okay";
+ clocks = <&uart2_clk>;
+};
--
2.27.0

99
board/roseapplepi/patches/linux/0002-kernel-add-support-for-gcc-5.patch
View File

@ -1,99 +0,0 @@
From 96b4fb75d15be65edc5494579e4a944534042f99 Mon Sep 17 00:00:00 2001
From: Sasha Levin <sasha.levin@oracle.com>
Date: Mon, 13 Oct 2014 15:51:05 -0700
Subject: [PATCH] kernel: add support for gcc 5
We're missing include/linux/compiler-gcc5.h which is required now
because gcc branched off to v5 in trunk.
Just copy the relevant bits out of include/linux/compiler-gcc4.h,
no new code is added as of now.
This fixes a build error when using gcc 5.
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 71458cfc782eafe4b27656e078d379a34e472adf)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
create mode 100644 include/linux/compiler-gcc5.h
diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
new file mode 100644
index 0000000..cdd1cc2
--- /dev/null
+++ b/include/linux/compiler-gcc5.h
@@ -0,0 +1,66 @@
+#ifndef __LINUX_COMPILER_H
+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
+#endif
+
+#define __used __attribute__((__used__))
+#define __must_check __attribute__((warn_unused_result))
+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
+
+/* Mark functions as cold. gcc will assume any path leading to a call
+ to them will be unlikely. This means a lot of manual unlikely()s
+ are unnecessary now for any paths leading to the usual suspects
+ like BUG(), printk(), panic() etc. [but let's keep them for now for
+ older compilers]
+
+ Early snapshots of gcc 4.3 don't support this and we can't detect this
+ in the preprocessor, but we can live with this because they're unreleased.
+ Maketime probing would be overkill here.
+
+ gcc also has a __attribute__((__hot__)) to move hot functions into
+ a special section, but I don't see any sense in this right now in
+ the kernel context */
+#define __cold __attribute__((__cold__))
+
+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
+
+#ifndef __CHECKER__
+# define __compiletime_warning(message) __attribute__((warning(message)))
+# define __compiletime_error(message) __attribute__((error(message)))
+#endif /* __CHECKER__ */
+
+/*
+ * Mark a position in code as unreachable. This can be used to
+ * suppress control flow warnings after asm blocks that transfer
+ * control elsewhere.
+ *
+ * Early snapshots of gcc 4.5 don't support this and we can't detect
+ * this in the preprocessor, but we can live with this because they're
+ * unreleased. Really, we need to have autoconf for the kernel.
+ */
+#define unreachable() __builtin_unreachable()
+
+/* Mark a function definition as prohibited from being cloned. */
+#define __noclone __attribute__((__noclone__))
+
+/*
+ * Tell the optimizer that something else uses this function or variable.
+ */
+#define __visible __attribute__((externally_visible))
+
+/*
+ * GCC 'asm goto' miscompiles certain code sequences:
+ *
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
+ *
+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
+ * Fixed in GCC 4.8.2 and later versions.
+ *
+ * (asm goto is automatically volatile - the naming reflects this.)
+ */
+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
+
+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
+#define __HAVE_BUILTIN_BSWAP32__
+#define __HAVE_BUILTIN_BSWAP64__
+#define __HAVE_BUILTIN_BSWAP16__
+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
--
2.10.2

54
board/roseapplepi/patches/linux/0003-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
View File

@ -1,54 +0,0 @@
From 8ac9a3f6dbf00d861134bea3f2c930defed6311a Mon Sep 17 00:00:00 2001
From: Behan Webster <behanw@converseincode.com>
Date: Wed, 24 Sep 2014 01:06:46 +0100
Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
With compilers which follow the C99 standard (like modern versions of gcc and
clang), "extern inline" does the wrong thing (emits code for an externally
linkable version of the inline function). In this case using static inline
and removing the NULL version of return_address in return_address.c does
the right thing.
Signed-off-by: Behan Webster <behanw@converseincode.com>
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
(cherry picked from commit aeea3592a13bf12861943e44fc48f1f270941f8d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
arch/arm/include/asm/ftrace.h | 2 +-
arch/arm/kernel/return_address.c | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
index f89515a..2bb8cac 100644
--- a/arch/arm/include/asm/ftrace.h
+++ b/arch/arm/include/asm/ftrace.h
@@ -45,7 +45,7 @@ void *return_address(unsigned int);
#else
-extern inline void *return_address(unsigned int level)
+static inline void *return_address(unsigned int level)
{
return NULL;
}
diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
index 2f8f523..a3b587f 100755
--- a/arch/arm/kernel/return_address.c
+++ b/arch/arm/kernel/return_address.c
@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
//#warning "TODO: return_address should use unwind tables"
//#endif
-void *return_address(unsigned int level)
-{
- return NULL;
-}
-
#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
EXPORT_SYMBOL_GPL(return_address);
--
2.10.2

121
board/roseapplepi/patches/linux/0004-Fix-compile-errors-with-gcc5.patch
View File

@ -1,121 +0,0 @@
From ef34609395c72a1e777ef9c3fb6ce60aa92976bb Mon Sep 17 00:00:00 2001
From: Marco Franceschetti <vonfritz1@gmail.com>
Date: Sun, 13 Mar 2016 09:44:54 +0100
Subject: [PATCH] Fix compile errors with gcc5
(cherry picked from commit e824d45043efd49607f66c89c921b07c1523bf9e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h | 6 +++---
drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h | 6 +++---
drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h | 6 +++---
drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h b/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h
index fc293c4..0898cd4 100755
--- a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h
+++ b/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h
@@ -1314,18 +1314,18 @@ enum ieee80211_state {
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
(((Addr[5]) & 0xff) == 0xff))
#else
-extern __inline int is_multicast_mac_addr(const u8 *addr)
+static __inline int is_multicast_mac_addr(const u8 *addr)
{
return ((addr[0] != 0xff) && (0x01 & addr[0]));
}
-extern __inline int is_broadcast_mac_addr(const u8 *addr)
+static __inline int is_broadcast_mac_addr(const u8 *addr)
{
return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
}
-extern __inline int is_zero_mac_addr(const u8 *addr)
+static __inline int is_zero_mac_addr(const u8 *addr)
{
return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
diff --git a/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
index 09475ef..56e0f5a 100755
--- a/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
+++ b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
@@ -1318,18 +1318,18 @@ enum ieee80211_state {
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
(((Addr[5]) & 0xff) == 0xff))
#else
-extern __inline int is_multicast_mac_addr(const u8 *addr)
+static __inline int is_multicast_mac_addr(const u8 *addr)
{
return ((addr[0] != 0xff) && (0x01 & addr[0]));
}
-extern __inline int is_broadcast_mac_addr(const u8 *addr)
+static __inline int is_broadcast_mac_addr(const u8 *addr)
{
return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
}
-extern __inline int is_zero_mac_addr(const u8 *addr)
+static __inline int is_zero_mac_addr(const u8 *addr)
{
return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
diff --git a/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h
index 5dfc421..95144b6 100755
--- a/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h
+++ b/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h
@@ -1314,18 +1314,18 @@ enum ieee80211_state {
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
(((Addr[5]) & 0xff) == 0xff))
#else
-extern __inline int is_multicast_mac_addr(const u8 *addr)
+static __inline int is_multicast_mac_addr(const u8 *addr)
{
return ((addr[0] != 0xff) && (0x01 & addr[0]));
}
-extern __inline int is_broadcast_mac_addr(const u8 *addr)
+static __inline int is_broadcast_mac_addr(const u8 *addr)
{
return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
}
-extern __inline int is_zero_mac_addr(const u8 *addr)
+static __inline int is_zero_mac_addr(const u8 *addr)
{
return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
diff --git a/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
index 09475ef..56e0f5a 100755
--- a/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
+++ b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
@@ -1318,18 +1318,18 @@ enum ieee80211_state {
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
(((Addr[5]) & 0xff) == 0xff))
#else
-extern __inline int is_multicast_mac_addr(const u8 *addr)
+static __inline int is_multicast_mac_addr(const u8 *addr)
{
return ((addr[0] != 0xff) && (0x01 & addr[0]));
}
-extern __inline int is_broadcast_mac_addr(const u8 *addr)
+static __inline int is_broadcast_mac_addr(const u8 *addr)
{
return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
}
-extern __inline int is_zero_mac_addr(const u8 *addr)
+static __inline int is_zero_mac_addr(const u8 *addr)
{
return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
--
2.10.2

363
board/roseapplepi/patches/linux/0005-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch
View File

@ -1,363 +0,0 @@
From 21be6b635320321216dde9201fa57a3aed60ee12 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 25 Jun 2015 15:01:02 -0700
Subject: [PATCH] compiler-gcc: integrate the various compiler-gcc[345].h files
As gcc major version numbers are going to advance rather rapidly in the
future, there's no real value in separate files for each compiler
version.
Deduplicate some of the macros #defined in each file too.
Neaten comments using normal kernel commenting style.
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Segher Boessenkool <segher@kernel.crashing.org>
Cc: Sasha Levin <levinsasha928@gmail.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: Alan Modra <amodra@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit cb984d101b30eb7478d32df56a0023e4603cba7f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
include/linux/compiler-gcc.h | 120 ++++++++++++++++++++++++++++++++++++++++--
include/linux/compiler-gcc3.h | 23 --------
include/linux/compiler-gcc4.h | 88 -------------------------------
include/linux/compiler-gcc5.h | 66 -----------------------
4 files changed, 116 insertions(+), 181 deletions(-)
delete mode 100644 include/linux/compiler-gcc3.h
delete mode 100644 include/linux/compiler-gcc4.h
delete mode 100644 include/linux/compiler-gcc5.h
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 24545cd90a25..0c5d746850c2 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -97,10 +97,122 @@
#define __maybe_unused __attribute__((unused))
#define __always_unused __attribute__((unused))
-#define __gcc_header(x) #x
-#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
-#define gcc_header(x) _gcc_header(x)
-#include gcc_header(__GNUC__)
+/* gcc version specific checks */
+
+#if GCC_VERSION < 30200
+# error Sorry, your compiler is too old - please upgrade it.
+#endif
+
+#if GCC_VERSION < 30300
+# define __used __attribute__((__unused__))
+#else
+# define __used __attribute__((__used__))
+#endif
+
+#ifdef CONFIG_GCOV_KERNEL
+# if GCC_VERSION < 30400
+# error "GCOV profiling support for gcc versions below 3.4 not included"
+# endif /* __GNUC_MINOR__ */
+#endif /* CONFIG_GCOV_KERNEL */
+
+#if GCC_VERSION >= 30400
+#define __must_check __attribute__((warn_unused_result))
+#endif
+
+#if GCC_VERSION >= 40000
+
+/* GCC 4.1.[01] miscompiles __weak */
+#ifdef __KERNEL__
+# if GCC_VERSION >= 40100 && GCC_VERSION <= 40101
+# error Your version of gcc miscompiles the __weak directive
+# endif
+#endif
+
+#define __used __attribute__((__used__))
+#define __compiler_offsetof(a, b) \
+ __builtin_offsetof(a, b)
+
+#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
+# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
+#endif
+
+#if GCC_VERSION >= 40300
+/* Mark functions as cold. gcc will assume any path leading to a call
+ * to them will be unlikely. This means a lot of manual unlikely()s
+ * are unnecessary now for any paths leading to the usual suspects
+ * like BUG(), printk(), panic() etc. [but let's keep them for now for
+ * older compilers]
+ *
+ * Early snapshots of gcc 4.3 don't support this and we can't detect this
+ * in the preprocessor, but we can live with this because they're unreleased.
+ * Maketime probing would be overkill here.
+ *
+ * gcc also has a __attribute__((__hot__)) to move hot functions into
+ * a special section, but I don't see any sense in this right now in
+ * the kernel context
+ */
+#define __cold __attribute__((__cold__))
+
+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
+
+#ifndef __CHECKER__
+# define __compiletime_warning(message) __attribute__((warning(message)))
+# define __compiletime_error(message) __attribute__((error(message)))
+#endif /* __CHECKER__ */
+#endif /* GCC_VERSION >= 40300 */
+
+#if GCC_VERSION >= 40500
+/*
+ * Mark a position in code as unreachable. This can be used to
+ * suppress control flow warnings after asm blocks that transfer
+ * control elsewhere.
+ *
+ * Early snapshots of gcc 4.5 don't support this and we can't detect
+ * this in the preprocessor, but we can live with this because they're
+ * unreleased. Really, we need to have autoconf for the kernel.
+ */
+#define unreachable() __builtin_unreachable()
+
+/* Mark a function definition as prohibited from being cloned. */
+#define __noclone __attribute__((__noclone__))
+
+#endif /* GCC_VERSION >= 40500 */
+
+#if GCC_VERSION >= 40600
+/*
+ * Tell the optimizer that something else uses this function or variable.
+ */
+#define __visible __attribute__((externally_visible))
+#endif
+
+/*
+ * GCC 'asm goto' miscompiles certain code sequences:
+ *
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
+ *
+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
+ *
+ * (asm goto is automatically volatile - the naming reflects this.)
+ */
+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
+
+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
+#if GCC_VERSION >= 40400
+#define __HAVE_BUILTIN_BSWAP32__
+#define __HAVE_BUILTIN_BSWAP64__
+#endif
+#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
+#define __HAVE_BUILTIN_BSWAP16__
+#endif
+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+
+#if GCC_VERSION >= 50000
+#define KASAN_ABI_VERSION 4
+#elif GCC_VERSION >= 40902
+#define KASAN_ABI_VERSION 3
+#endif
+
+#endif /* gcc version >= 40000 specific checks */
#if !defined(__noclone)
#define __noclone /* not needed */
diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h
deleted file mode 100644
index 7d89febe4d79..000000000000
--- a/include/linux/compiler-gcc3.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __LINUX_COMPILER_H
-#error "Please don't include <linux/compiler-gcc3.h> directly, include <linux/compiler.h> instead."
-#endif
-
-#if GCC_VERSION < 30200
-# error Sorry, your compiler is too old - please upgrade it.
-#endif
-
-#if GCC_VERSION >= 30300
-# define __used __attribute__((__used__))
-#else
-# define __used __attribute__((__unused__))
-#endif
-
-#if GCC_VERSION >= 30400
-#define __must_check __attribute__((warn_unused_result))
-#endif
-
-#ifdef CONFIG_GCOV_KERNEL
-# if GCC_VERSION < 30400
-# error "GCOV profiling support for gcc versions below 3.4 not included"
-# endif /* __GNUC_MINOR__ */
-#endif /* CONFIG_GCOV_KERNEL */
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
deleted file mode 100644
index 2507fd2a1eb4..000000000000
--- a/include/linux/compiler-gcc4.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef __LINUX_COMPILER_H
-#error "Please don't include <linux/compiler-gcc4.h> directly, include <linux/compiler.h> instead."
-#endif
-
-/* GCC 4.1.[01] miscompiles __weak */
-#ifdef __KERNEL__
-# if GCC_VERSION >= 40100 && GCC_VERSION <= 40101
-# error Your version of gcc miscompiles the __weak directive
-# endif
-#endif
-
-#define __used __attribute__((__used__))
-#define __must_check __attribute__((warn_unused_result))
-#define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
-
-#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
-# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
-#endif
-
-#if GCC_VERSION >= 40300
-/* Mark functions as cold. gcc will assume any path leading to a call
- to them will be unlikely. This means a lot of manual unlikely()s
- are unnecessary now for any paths leading to the usual suspects
- like BUG(), printk(), panic() etc. [but let's keep them for now for
- older compilers]
-
- Early snapshots of gcc 4.3 don't support this and we can't detect this
- in the preprocessor, but we can live with this because they're unreleased.
- Maketime probing would be overkill here.
-
- gcc also has a __attribute__((__hot__)) to move hot functions into
- a special section, but I don't see any sense in this right now in
- the kernel context */
-#define __cold __attribute__((__cold__))
-
-#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
-
-#ifndef __CHECKER__
-# define __compiletime_warning(message) __attribute__((warning(message)))
-# define __compiletime_error(message) __attribute__((error(message)))
-#endif /* __CHECKER__ */
-#endif /* GCC_VERSION >= 40300 */
-
-#if GCC_VERSION >= 40500
-/*
- * Mark a position in code as unreachable. This can be used to
- * suppress control flow warnings after asm blocks that transfer
- * control elsewhere.
- *
- * Early snapshots of gcc 4.5 don't support this and we can't detect
- * this in the preprocessor, but we can live with this because they're
- * unreleased. Really, we need to have autoconf for the kernel.
- */
-#define unreachable() __builtin_unreachable()
-
-/* Mark a function definition as prohibited from being cloned. */
-#define __noclone __attribute__((__noclone__))
-
-#endif /* GCC_VERSION >= 40500 */
-
-#if GCC_VERSION >= 40600
-/*
- * Tell the optimizer that something else uses this function or variable.
- */
-#define __visible __attribute__((externally_visible))
-#endif
-
-/*
- * GCC 'asm goto' miscompiles certain code sequences:
- *
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
- *
- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
- * Fixed in GCC 4.8.2 and later versions.
- *
- * (asm goto is automatically volatile - the naming reflects this.)
- */
-#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
-
-#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
-#if GCC_VERSION >= 40400
-#define __HAVE_BUILTIN_BSWAP32__
-#define __HAVE_BUILTIN_BSWAP64__
-#endif
-#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
-#define __HAVE_BUILTIN_BSWAP16__
-#endif
-#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
deleted file mode 100644
index cdd1cc202d51..000000000000
--- a/include/linux/compiler-gcc5.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef __LINUX_COMPILER_H
-#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
-#endif
-
-#define __used __attribute__((__used__))
-#define __must_check __attribute__((warn_unused_result))
-#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
-
-/* Mark functions as cold. gcc will assume any path leading to a call
- to them will be unlikely. This means a lot of manual unlikely()s
- are unnecessary now for any paths leading to the usual suspects
- like BUG(), printk(), panic() etc. [but let's keep them for now for
- older compilers]
-
- Early snapshots of gcc 4.3 don't support this and we can't detect this
- in the preprocessor, but we can live with this because they're unreleased.
- Maketime probing would be overkill here.
-
- gcc also has a __attribute__((__hot__)) to move hot functions into
- a special section, but I don't see any sense in this right now in
- the kernel context */
-#define __cold __attribute__((__cold__))
-
-#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
-
-#ifndef __CHECKER__
-# define __compiletime_warning(message) __attribute__((warning(message)))
-# define __compiletime_error(message) __attribute__((error(message)))
-#endif /* __CHECKER__ */
-
-/*
- * Mark a position in code as unreachable. This can be used to
- * suppress control flow warnings after asm blocks that transfer
- * control elsewhere.
- *
- * Early snapshots of gcc 4.5 don't support this and we can't detect
- * this in the preprocessor, but we can live with this because they're
- * unreleased. Really, we need to have autoconf for the kernel.
- */
-#define unreachable() __builtin_unreachable()
-
-/* Mark a function definition as prohibited from being cloned. */
-#define __noclone __attribute__((__noclone__))
-
-/*
- * Tell the optimizer that something else uses this function or variable.
- */
-#define __visible __attribute__((externally_visible))
-
-/*
- * GCC 'asm goto' miscompiles certain code sequences:
- *
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
- *
- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
- * Fixed in GCC 4.8.2 and later versions.
- *
- * (asm goto is automatically volatile - the naming reflects this.)
- */
-#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
-
-#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
-#define __HAVE_BUILTIN_BSWAP32__
-#define __HAVE_BUILTIN_BSWAP64__
-#define __HAVE_BUILTIN_BSWAP16__
-#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
--
2.11.0

2
board/roseapplepi/uEnv.txt Executable file → Normal file
View File

@ -1,3 +1,3 @@
# no ramdisk
ramdisk_addr_r=-
bootargs=clk_ignore_unused root=/dev/mmcblk0p2
bootargs=console=ttyOWL2,115200

4
boot/at91bootstrap3/Config.in
View File

@ -19,7 +19,7 @@ choice
prompt "AT91 Bootstrap 3 version"
config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
bool "3.9.2"
bool "3.9.3"
config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
bool "Custom Git repository"
@ -51,7 +51,7 @@ endif
config BR2_TARGET_AT91BOOTSTRAP3_VERSION
string
default "v3.9.2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
default "v3.9.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \
if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL

2
boot/at91bootstrap3/at91bootstrap3.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 6cf37df482024f3770fe1880f768a675beda16323a90e702860d9e5478105b3f at91bootstrap3-v3.9.2.tar.gz
sha256 dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1 at91bootstrap3-v3.9.3.tar.gz
sha256 732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e main.c

45
configs/rock_pi_n8_defconfig Normal file
View File

@ -0,0 +1,45 @@
# Architecture
BR2_arm=y
BR2_cortex_a17=y
BR2_ARM_FPU_NEON_VFPV4=y
# Linux headers same as kernel, a 5.7 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y
# Bootloader
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula.git"
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="ba120841bf40ebaed049d64bb4f980083a1cf6b7"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-n8-rk3288"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="idbloader.img"
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/amarula/linux-amarula.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="5dcb0132685b07beb82065c5d7521e6c555c55b6"
BR2_LINUX_KERNEL_USE_DEFCONFIG=y
BR2_LINUX_KERNEL_DEFCONFIG="multi_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-rock-pi-n8"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
# Filesystem
BR2_TARGET_GENERIC_HOSTNAME="rockpi-n8"
BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPI-N8"
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rockpi-n8/genimage.cfg"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-n8/post-build.sh"

20
configs/roseapplepi_defconfig
View File

@ -2,27 +2,25 @@ BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_NEON=y
BR2_ARM_ENABLE_VFP=y
BR2_GLOBAL_PATCH_DIR="board/roseapplepi/patches"
# Linux headers same as kernel, a 3.10 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
# kernel does not build with gcc 8.x
BR2_GCC_VERSION_7_X=y
# Linux headers same as kernel, a 5.7 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/roseapplepi/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,xapp-le,kernel,59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b)/linux-59dbf6a4998e967eb9c6bdcc9b506c0d96acb26b.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="actduino_bubble_gum_linux"
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="actduino_bubble_gum_sdboot_linux"
BR2_LINUX_KERNEL_INTREE_DTS_NAME="owl-s500-roseapplepi"
# Filesystem / image
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_INITRAMFS=y
# BR2_TARGET_ROOTFS_TAR is not set
# Bootloaders

16
docs/manual/adding-packages-golang.txt
View File

@ -76,15 +76,13 @@ optionally be defined, depending on the package's needs. Many of them
are only useful in very specific cases, typical packages will
therefore only use a few of them, or none.
* If your package need a custom +GOPATH+ to be compiled in, you can
use the +FOO_WORKSPACE+ variable. The +GOPATH+ being used will be
+<package-srcdir>/<FOO_WORKSPACE>+. If +FOO_WORKSPACE+ is not
specified, it defaults to +_gopath+.
* +FOO_SRC_SUBDIR+ is the sub-directory where your source will be
compiled relatively to the +GOPATH+. An example value is
+github.com/bar/foo+. If +FOO_SRC_SUBDIR+ is not specified, it
defaults to a value infered from the +FOO_SITE+ variable.
* The package must specify its Go module name in the +FOO_GOMOD+
variable. If not specified, it defaults to
+URL-domain/1st-part-of-URL/2nd-part-of-URL+, e.g +FOO_GOMOD+ will
take the value +github.com/bar/foo+ for a package that specifies
+FOO_SITE = $(call github,bar,foo,$(FOO_VERSION))+. The Go package
infrastructure will automatically generate a minimal +go.mod+ file
in the package source tree if it doesn't exist.
* +FOO_LDFLAGS+ and +FOO_TAGS+ can be used to pass respectively the
+LDFLAGS+ or the +TAGS+ to the +go+ build command.

17
package/Config.in
View File

@ -417,7 +417,6 @@ endmenu
source "package/acpitool/Config.in"
source "package/aer-inject/Config.in"
source "package/am335x-pru-package/Config.in"
source "package/amd-catalyst/Config.in"
source "package/apcupsd/Config.in"
source "package/avrdude/Config.in"
source "package/bcache-tools/Config.in"
@ -500,7 +499,6 @@ endmenu
source "package/nanocom/Config.in"
source "package/neard/Config.in"
source "package/nvidia-driver/Config.in"
source "package/nvidia-tegra23/Config.in"
source "package/nvme/Config.in"
source "package/ofono/Config.in"
source "package/on2-8170-modules/Config.in"
@ -872,6 +870,7 @@ menu "External python modules"
source "package/python-aiosignal/Config.in"
source "package/python-aiozipkin/Config.in"
source "package/python-alsaaudio/Config.in"
source "package/python-ansicolors/Config.in"
source "package/python-argh/Config.in"
source "package/python-argon2-cffi/Config.in"
source "package/python-arrow/Config.in"
@ -895,6 +894,7 @@ menu "External python modules"
source "package/python-bluezero/Config.in"
source "package/python-bottle/Config.in"
source "package/python-brotli/Config.in"
source "package/python-bsdiff4/Config.in"
source "package/python-bunch/Config.in"
source "package/python-cached-property/Config.in"
source "package/python-can/Config.in"
@ -1044,6 +1044,7 @@ menu "External python modules"
source "package/python-nfc/Config.in"
source "package/python-numpy/Config.in"
source "package/python-oauthlib/Config.in"
source "package/python-packaging/Config.in"
source "package/python-paho-mqtt/Config.in"
source "package/python-pam/Config.in"
source "package/python-paramiko/Config.in"
@ -1469,6 +1470,7 @@ menu "Graphics"
source "package/waffle/Config.in"
source "package/wayland/Config.in"
source "package/wayland-protocols/Config.in"
source "package/wayland-utils/Config.in"
source "package/waylandpp/Config.in"
source "package/webkitgtk/Config.in"
source "package/webp/Config.in"
@ -1494,6 +1496,7 @@ menu "Hardware handling"
source "package/let-me-create/Config.in"
source "package/libaio/Config.in"
source "package/libatasmart/Config.in"
source "package/libblockdev/Config.in"
source "package/libcec/Config.in"
source "package/libfreefare/Config.in"
source "package/libftdi/Config.in"
@ -1533,6 +1536,7 @@ menu "Hardware handling"
source "package/owfs/Config.in"
source "package/pcsc-lite/Config.in"
source "package/tslib/Config.in"
source "package/uhd/Config.in"
source "package/urg/Config.in"
endmenu
@ -1737,6 +1741,7 @@ menu "Networking"
source "package/libtirpc/Config.in"
source "package/libtorrent/Config.in"
source "package/libtorrent-rasterbar/Config.in"
source "package/libuev/Config.in"
source "package/libuhttpd/Config.in"
source "package/libupnp/Config.in"
source "package/libupnp18/Config.in"
@ -1831,7 +1836,9 @@ menu "Other"
source "package/libatomic_ops/Config.in"
source "package/libavl/Config.in"
source "package/libb64/Config.in"
source "package/libbacktrace/Config.in"
source "package/libbsd/Config.in"
source "package/libbytesize/Config.in"
source "package/libcap/Config.in"
source "package/libcap-ng/Config.in"
source "package/libcgroup/Config.in"
@ -1942,6 +1949,7 @@ menu "Text and terminal handling"
source "package/pcre/Config.in"
source "package/pcre2/Config.in"
source "package/popt/Config.in"
source "package/re2/Config.in"
source "package/readline/Config.in"
source "package/slang/Config.in"
source "package/tclap/Config.in"
@ -2039,6 +2047,7 @@ menu "Networking applications"
source "package/dnsmasq/Config.in"
source "package/drbd-utils/Config.in"
source "package/dropbear/Config.in"
source "package/easyframes/Config.in"
source "package/ebtables/Config.in"
source "package/ejabberd/Config.in"
source "package/ethtool/Config.in"
@ -2051,6 +2060,7 @@ menu "Networking applications"
source "package/fping/Config.in"
source "package/freeswitch/Config.in"
source "package/freeswitch-mod-bcg729/Config.in"
source "package/frr/Config.in"
source "package/gerbera/Config.in"
source "package/gesftpserver/Config.in"
source "package/gloox/Config.in"
@ -2180,6 +2190,7 @@ endif
source "package/rabbitmq-server/Config.in"
source "package/radvd/Config.in"
source "package/reaver/Config.in"
source "package/redir/Config.in"
source "package/rp-pppoe/Config.in"
source "package/rpcbind/Config.in"
source "package/rsh-redone/Config.in"
@ -2232,6 +2243,7 @@ endif
source "package/uhttpd/Config.in"
source "package/ulogd/Config.in"
source "package/unbound/Config.in"
source "package/uredir/Config.in"
source "package/ushare/Config.in"
source "package/ussp-push/Config.in"
source "package/vde2/Config.in"
@ -2421,6 +2433,7 @@ menu "System tools"
source "package/tpm2-totp/Config.in"
source "package/unscd/Config.in"
source "package/util-linux/Config.in"
source "package/watchdog/Config.in"
source "package/xdg-dbus-proxy/Config.in"
source "package/xen/Config.in"
source "package/xvisor/Config.in"

1
package/Config.in.host
View File

@ -42,6 +42,7 @@ menu "Host utilities"
source "package/lpc3250loader/Config.in.host"
source "package/lttng-babeltrace/Config.in.host"
source "package/mender-artifact/Config.in.host"
source "package/meson-tools/Config.in.host"
source "package/mfgtools/Config.in.host"
source "package/mkpasswd/Config.in.host"
source "package/mtd/Config.in.host"

45
package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch
View File

@ -1,45 +0,0 @@
From c35482bc0cc56b40263b74c3e58e42be867fd9f2 Mon Sep 17 00:00:00 2001
From: Alberto Milone <alberto.milone@canonical.com>
Date: Thu, 17 Sep 2015 15:41:46 +0200
Subject: [PATCH] Add support for Linux 4.0
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
---
common/lib/modules/fglrx/build_mod/firegl_public.c | 5 +++++
common/lib/modules/fglrx/build_mod/kcl_str.c | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
index 677565d..6017e89 100755
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
@@ -285,6 +285,11 @@ MODULE_DEVICE_TABLE(pci, fglrx_pci_table);
MODULE_INFO(supported, "external");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
+#define read_cr4() __read_cr4()
+#define write_cr4(cr4) __write_cr4(cr4)
+#endif
+
/* globals constants */
const char* KCL_SYSINFO_OsVersionString = UTS_RELEASE;
const unsigned int KCL_SYSINFO_PageSize = PAGE_SIZE;
diff --git a/common/lib/modules/fglrx/build_mod/kcl_str.c b/common/lib/modules/fglrx/build_mod/kcl_str.c
index 2d89eb0..bacdb69 100755
--- a/common/lib/modules/fglrx/build_mod/kcl_str.c
+++ b/common/lib/modules/fglrx/build_mod/kcl_str.c
@@ -42,6 +42,10 @@
#include "kcl_type.h"
#include "kcl_str.h"
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
+#define strnicmp strncasecmp
+#endif
+
/** \brief Fill memory with a constant byte
* \param s Pointer to memory
* \param c Initializing value
--
2.8.1

31
package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch
View File

@ -1,31 +0,0 @@
From e9c8ccb4c8c842042542b792c51f9a7ec6c85e06 Mon Sep 17 00:00:00 2001
From: Alberto Milone <alberto.milone@canonical.com>
Date: Thu, 17 Sep 2015 15:44:59 +0200
Subject: [PATCH] Add support for Linux 4.1
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
---
common/lib/modules/fglrx/build_mod/firegl_public.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
index 6017e89..94778f1 100755
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
@@ -3508,10 +3508,12 @@ int ATI_API_CALL KCL_InstallInterruptHandler(
KCL_PUB_InterruptHandlerWrap,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)),
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
//when MSI enabled. keep irq disabled when calling the action handler,
//exclude this IRQ from irq balancing (only on one CPU)
((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)),
+#else
+ ((useMSI) ? (0x0) : (IRQF_SHARED)),
#endif
dev_name,
context);
--
2.8.1

121
package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch
View File

@ -1,121 +0,0 @@
From e2e6c2dac2a0311a022208dd289374b832538329 Mon Sep 17 00:00:00 2001
From: Alberto Milone <alberto.milone@canonical.com>
Date: Tue, 14 Jul 2015 12:56:37 +0200
Subject: [PATCH] Add support for Linux 4.2
Deal with the FPU code renaming
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
---
common/lib/modules/fglrx/build_mod/firegl_public.c | 38 ++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
index 94778f1..749ea51 100755
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
@@ -191,9 +191,17 @@
#include <linux/string.h>
#include <linux/gfp.h>
#include <linux/swap.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
#include "asm/i387.h"
+#else
+#include <asm/fpu/api.h>
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
#include <asm/fpu-internal.h>
+#else
+#include <asm/fpu/internal.h>
+#endif
#endif
#include "firegl_public.h"
@@ -1711,6 +1719,9 @@ void ATI_API_CALL KCL_SetCurrentProcessState(KCL_ENUM_ProcessState state)
#if defined(__i386__)
#ifndef __HAVE_ARCH_CMPXCHG
+#ifndef __xg
+#define __xg(x) ((volatile long *)(x))
+#endif
static inline
unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old,
unsigned long new, int size)
@@ -1747,7 +1758,11 @@ unsigned long ATI_API_CALL kcl__cmpxchg(volatile void *ptr, unsigned long old,
unsigned long new, int size)
{
#ifndef __HAVE_ARCH_CMPXCHG
+#if defined(__i386__)
return __fgl_cmpxchg(ptr,old,new,size);
+#elif defined(__x86_64__)
+ return cmpxchg((unsigned long*)ptr,old,new);
+#endif
#else
/* On kernel version 2.6.34 passing a variable or unsupported size
* argument to the __cmpxchg macro causes the default-clause of a
@@ -6443,21 +6458,36 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
struct fpu *fpu = &tsk->thread.fpu;
if(static_cpu_has(X86_FEATURE_XSAVE)) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
fpu_xsave(fpu);
if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
+#else
+ copy_xregs_to_kernel(&fpu->state.xsave);
+ if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
+#endif
return 1;
} else if (static_cpu_has(X86_FEATURE_FXSR)) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
fpu_fxsave(fpu);
+#else
+ copy_fxregs_to_kernel(fpu);
+#endif
} else {
asm volatile("fnsave %[fx]; fwait"
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
: [fx] "=m" (fpu->state->fsave));
+#else
+ : [fx] "=m" (fpu->state.fsave));
+#endif
return 0;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
if (unlikely(fpu->state->fxsave.swd & X87_FSW_ES)) {
asm volatile("fnclex");
return 0;
}
+#endif
return 1;
}
#endif
@@ -6469,8 +6499,12 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
void ATI_API_CALL KCL_fpu_begin(void)
{
#ifdef CONFIG_X86_64
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
kernel_fpu_begin();
#else
+ __kernel_fpu_begin();
+#endif
+#else
#ifdef TS_USEDFPU
struct thread_info *cur_thread = current_thread_info();
struct task_struct *cur_task = get_current();
@@ -6515,7 +6549,11 @@ void ATI_API_CALL KCL_fpu_begin(void)
*/
void ATI_API_CALL KCL_fpu_end(void)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
kernel_fpu_end();
+#else
+ __kernel_fpu_end();
+#endif
}
/** Create new directory entry under "/proc/...."
--
2.8.1

33
package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch
View File

@ -1,33 +0,0 @@
From 7120f00015570a2e4d9b6532731960d509c71cba Mon Sep 17 00:00:00 2001
From: Alberto Milone <alberto.milone@canonical.com>
Date: Thu, 17 Sep 2015 15:48:30 +0200
Subject: [PATCH] Use fpregs_active instead of has_fpu
This is for Linux 4.2
Thanks to Tim Gardner for the patch.
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
---
common/lib/modules/fglrx/build_mod/firegl_public.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
index 749ea51..4c1f9a5 100755
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
@@ -6528,7 +6528,11 @@ void ATI_API_CALL KCL_fpu_begin(void)
/* The thread structure is changed with the commit below for kernel 3.3:
* https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d179bc04d590c8
*/
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
+ if (cur_task->thread.fpu.fpregs_active)
+#else
if (cur_task->thread.fpu.has_fpu)
+#endif
#else
if (cur_task->thread.has_fpu)
#endif
--
2.8.1

79
package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch
View File

@ -1,79 +0,0 @@
From eb703737be5c91c1a0817351db8ec152c523c85d Mon Sep 17 00:00:00 2001
From: Alberto Milone <alberto.milone@canonical.com>
Date: Thu, 17 Sep 2015 15:49:46 +0200
Subject: [PATCH] Use a local copy of copy_xregs_to_kernel
This is needed for Linux 4.2.
Thanks to Tim Gardner for the patch.
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
---
common/lib/modules/fglrx/build_mod/firegl_public.c | 44 +++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
index 4c1f9a5..bb67bba 100755
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
@@ -6443,6 +6443,48 @@ int ATI_API_CALL kcl_sscanf(const char * buf, const char * fmt, ...)
return i;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
+/*
+ * Save processor xstate to xsave area.
+ */
+static void _copy_xregs_to_kernel(struct xregs_state *xstate)
+{
+ u64 mask = -1;
+ u32 lmask = mask;
+ u32 hmask = mask >> 32;
+ int err = 0;
+
+ /*WARN_ON(!alternatives_patched);*/
+
+ /*
+ * If xsaves is enabled, xsaves replaces xsaveopt because
+ * it supports compact format and supervisor states in addition to
+ * modified optimization in xsaveopt.
+ *
+ * Otherwise, if xsaveopt is enabled, xsaveopt replaces xsave
+ * because xsaveopt supports modified optimization which is not
+ * supported by xsave.
+ *
+ * If none of xsaves and xsaveopt is enabled, use xsave.
+ */
+ alternative_input_2(
+ "1:"XSAVE,
+ XSAVEOPT,
+ X86_FEATURE_XSAVEOPT,
+ XSAVES,
+ X86_FEATURE_XSAVES,
+ [xstate] "D" (xstate), "a" (lmask), "d" (hmask) :
+ "memory");
+ asm volatile("2:\n\t"
+ xstate_fault(err)
+ : "0" (err)
+ : "memory");
+
+ /* We should never fault when copying to a kernel buffer: */
+ WARN_ON_FPU(err);
+}
+#endif
+
/** \brief Generate UUID
* \param buf pointer to the generated UUID
* \return None
@@ -6462,7 +6504,7 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
fpu_xsave(fpu);
if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
#else
- copy_xregs_to_kernel(&fpu->state.xsave);
+ _copy_xregs_to_kernel(&fpu->state.xsave);
if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
#endif
return 1;
--
2.8.1

78
package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch
View File

@ -1,78 +0,0 @@
From 54b230e26a1889c08507e791ab043f8a4b4ff771 Mon Sep 17 00:00:00 2001
From: Romain Perier <romain.perier@free-electrons.com>
Date: Thu, 7 Jul 2016 14:40:53 +0200
Subject: [PATCH] Add support for Linux 4.4
It fixes various things like the use of seq_printf because its API
changed. It also replaces the call to mtrr_add and mtrr_del by
arch_phys_wc_add and arch_phys_wc_del because these symbols are
no longer exported for Linux >= 4.3.x.
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
---
common/lib/modules/fglrx/build_mod/firegl_public.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
index bb67bba..b4b2d30 100755
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
@@ -636,9 +636,16 @@ static int firegl_major_proc_read(struct seq_file *m, void* data)
len = snprintf(buf, request, "%d\n", major);
#else
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
+ seq_printf(m, "%d\n", major);
+ len = 0;
+#else
len = seq_printf(m, "%d\n", major);
#endif
+#endif
+
KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len);
return len;
@@ -3432,7 +3439,11 @@ int ATI_API_CALL KCL_MEM_MTRR_Support(void)
int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size)
{
#ifdef CONFIG_MTRR
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
+ return arch_phys_wc_add(base, size);
+#else
return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1);
+#endif
#else /* !CONFIG_MTRR */
return -EPERM;
#endif /* !CONFIG_MTRR */
@@ -3441,7 +3452,12 @@ int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size
int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size)
{
#ifdef CONFIG_MTRR
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
+ arch_phys_wc_del(reg);
+ return 0;
+#else
return mtrr_del(reg, base, size);
+#endif
#else /* !CONFIG_MTRR */
return -EPERM;
#endif /* !CONFIG_MTRR */
@@ -6505,8 +6521,13 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
#else
_copy_xregs_to_kernel(&fpu->state.xsave);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
+ if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP))
+#else
if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
#endif
+
+#endif
return 1;
} else if (static_cpu_has(X86_FEATURE_FXSR)) {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
--
2.8.1

54
package/amd-catalyst/0007-remove-gpl-symbols.patch
View File

@ -1,54 +0,0 @@
Author: Manuel Rüger <mrueg@gentoo.org>
Date: Sat, 2 Jan 2016 17:24:30 +0100
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/x11-drivers/ati-drivers/files?id=179aa11ed2f1bd79cf1b190263c3a7a07279fc50
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
---
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:02.000000000 -0400
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:11.000000000 -0400
@@ -136,7 +136,6 @@
#include <asm/mman.h>
#include <asm/uaccess.h>
#include <asm/processor.h>
-#include <asm/tlbflush.h> // for flush_tlb_page
#include <asm/cpufeature.h>
#ifdef CONFIG_MTRR
#include <asm/mtrr.h>
@@ -251,6 +250,26 @@
#define WRITE_CR4(x) write_cr4(x)
#endif
+#define __flush_tlb_one(addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory")
+#define __flush_tlb() native_write_cr3(native_read_cr3())
+
+static inline void __flush_tlb_all(void)
+{
+ if (cpu_has_pge)
+ {
+ unsigned long flags, cr4;
+ raw_local_irq_save(flags);
+ cr4 = native_read_cr4();
+ native_write_cr4(cr4 & ~X86_CR4_PGE);
+ native_write_cr4(cr4);
+ raw_local_irq_restore(flags);
+ }
+ else
+ {
+ __flush_tlb();
+ }
+}
+
// ============================================================
/* globals */
--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:35.000000000 -0400
+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:48.000000000 -0400
@@ -868,7 +868,7 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(vo
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
if(pdev)
{
-#if (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8))
+#if 0 && (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8))
pci_ignore_hotplug(pdev);
#else
pdev->ignore_hotplug = 1;

4
package/amd-catalyst/20-fglrx.conf
View File

@ -1,4 +0,0 @@
Section "Device"
Identifier "AMD Radeon GPU"
Driver "fglrx"
EndSection

65
package/amd-catalyst/Config.in
View File

@ -1,65 +0,0 @@
comment "amd-catalyst needs a glibc toolchain"
depends on BR2_i386 || BR2_x86_64
depends on !BR2_TOOLCHAIN_USES_GLIBC
config BR2_PACKAGE_AMD_CATALYST
bool "amd-catalyst"
depends on BR2_i386 || BR2_x86_64
depends on BR2_TOOLCHAIN_USES_GLIBC
help
The binary-only driver blob for AMD cards.
This driver supports AMD Radeon HD 5xxx and newer graphics
cards.
http://www.amd.com/
if BR2_PACKAGE_AMD_CATALYST
comment "amd-catalyst X.org drivers needs a modular Xorg server <= 1.17"
depends on !BR2_PACKAGE_XORG7 \
|| !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR \
|| !BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
config BR2_PACKAGE_AMD_CATALYST_XORG
bool "X.org drivers"
default y
depends on BR2_PACKAGE_XORG7
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
select BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
select BR2_PACKAGE_ACPID # runtime
select BR2_PACKAGE_XLIB_LIBX11 # runtime
select BR2_PACKAGE_XLIB_LIBXEXT # runtime
select BR2_PACKAGE_XLIB_LIBXCOMPOSITE # runtime
# This package does not have standard GL headers
select BR2_PACKAGE_MESA3D_HEADERS
select BR2_PACKAGE_HAS_LIBGL
if BR2_PACKAGE_AMD_CATALYST_XORG
config BR2_PACKAGE_PROVIDES_LIBGL
default "amd-catalyst"
config BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS
bool "command-line configuration tools"
help
Build and install the AMD command line tools.
endif
comment "amd-catalyst kernel module needs a kernel to be built"
depends on !BR2_LINUX_KERNEL
config BR2_PACKAGE_AMD_CATALYST_MODULE
bool "fglrx kernel module"
depends on BR2_LINUX_KERNEL
help
Builds and install the fglrx kernel module
config BR2_PACKAGE_AMD_CATALYST_OPENCL
bool "OpenCL support"
help
Installs the OpenCL binary blobs and the ICD profile
for GPGPU computing.
endif # BR2_PACKAGE_AMD_CATALYST

2
package/amd-catalyst/amd-catalyst.hash
View File

@ -1,2 +0,0 @@
# Locally computed
sha256 bf3e6e7d5c51db3d075410a3f116f865b82823debc1d66698d187249feec6a91 amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip

162
package/amd-catalyst/amd-catalyst.mk
View File

@ -1,162 +0,0 @@
################################################################################
#
# amd-catalyst
#
################################################################################
AMD_CATALYST_VERSION = 15.9
AMD_CATALYST_VERBOSE_VER = 15.201.1151
AMD_CATALYST_SITE = http://www2.ati.com/drivers/linux
AMD_CATALYST_DL_OPTS = --referer='http://support.amd.com'
AMD_CATALYST_SOURCE = amd-catalyst-$(AMD_CATALYST_VERSION)-linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.zip
AMD_CATALYST_LICENSE = AMD Software License
AMD_CATALYST_LICENSE_FILES = LICENSE.TXT
AMD_CATALYST_INSTALL_STAGING = YES
AMD_CATALYST_SUFFIX = $(if $(BR2_x86_64),_64)
AMD_CATALYST_ARCH_DIR = $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)
AMD_CATALYST_LIB_SUFFIX = $(if $(BR2_x86_64),64)
define AMD_CATALYST_EXTRACT_CMDS
unzip -q $(AMD_CATALYST_DL_DIR)/$(AMD_CATALYST_SOURCE) -d $(@D)
$(SHELL) $(@D)/AMD-Catalyst-$(AMD_CATALYST_VERSION)-Linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.run --extract $(@D)
endef
ifeq ($(BR2_PACKAGE_AMD_CATALYST_MODULE),y)
AMD_CATALYST_MODULE_SUBDIRS = common/lib/modules/fglrx/build_mod/2.6.x
AMD_CATALYST_MODULE_MAKE_OPTS = \
CFLAGS_MODULE="-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
define AMD_CATALYST_PREPARE_MODULE
# The Makefile expects to have source in the folder 2.6.x
cp $(@D)/common/lib/modules/fglrx/build_mod/*.{c,h} \
$(@D)/common/lib/modules/fglrx/build_mod/2.6.x
# This static lib is required during the link
cp $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)/lib/modules/fglrx/build_mod/libfglrx_ip.a \
$(@D)/common/lib/modules/fglrx/build_mod/2.6.x
endef
AMD_CATALYST_POST_PATCH_HOOKS += AMD_CATALYST_PREPARE_MODULE
$(eval $(kernel-module))
endif
ifeq ($(BR2_PACKAGE_AMD_CATALYST_OPENCL),y)
AMD_CATALYST_OCL_SUFFIX = $(if $(BR2_x86_64),64,32)
AMD_CATALYST_OPENCL_FILES = \
libOpenCL.so.1 \
libaticalcl.so \
libamdocl$(AMD_CATALYST_OCL_SUFFIX).so \
libamdocl12cl$(AMD_CATALYST_OCL_SUFFIX).so
define AMD_CATALYST_INSTALL_OPENCL
$(foreach f,$(AMD_CATALYST_OPENCL_FILES), \
$(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/$(f) $(TARGET_DIR)/usr/lib/$(f)
)
ln -sf libOpenCL.so.1 \
$(TARGET_DIR)/usr/lib/libOpenCL.so
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/bin/clinfo \
$(TARGET_DIR)/usr/bin/clinfo
$(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd \
$(TARGET_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd
endef
endif
ifeq ($(BR2_PACKAGE_AMD_CATALYST_XORG), y)
# GL headers are needed by any package that wants to use libgl, so they need to
# be installed before any user of it. The only way to do so is to have this
# package depends on mesa3d-headers.
AMD_CATALYST_DEPENDENCIES += mesa3d-headers
AMD_CATALYST_PROVIDES = libgl
AMD_CATALYST_X11R6_LIB = $(@D)/xpic$(if $(BR2_x86_64),_64a)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)
define AMD_CATALYST_INSTALL_GL_LIBS
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/fglrx/fglrx-libGL.so.1.2 \
$(1)/usr/lib
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1.2
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so
endef
define AMD_CATALYST_INSTALL_STAGING_XORG
$(call AMD_CATALYST_INSTALL_GL_LIBS,$(STAGING_DIR))
$(INSTALL) -D -m 0644 package/amd-catalyst/gl.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/gl.pc
endef
AMD_CATALYST_XORG_DRIVERS_FILES = modules/amdxmm.so \
modules/drivers/fglrx_drv.so \
modules/linux/libfglrxdrm.so
define AMD_CATALYST_INSTALL_XORG
# Xorg drivers
$(foreach f,$(AMD_CATALYST_XORG_DRIVERS_FILES), \
$(INSTALL) -D -m 0755 $(AMD_CATALYST_X11R6_LIB)/$(f) \
$(TARGET_DIR)/usr/lib/xorg/$(f)
)
# Xorg is not able to detect the driver automatically
$(INSTALL) -D -m 0644 package/amd-catalyst/20-fglrx.conf \
$(TARGET_DIR)/etc/X11/xorg.conf.d/20-fglrx.conf
# Common files: containing binary profiles about GPUs,
# required by the fglrx_drv xorg driver
$(INSTALL) -d $(TARGET_DIR)/etc/ati
$(INSTALL) -m 0644 $(@D)/common/etc/ati/* $(TARGET_DIR)/etc/ati/
# DRI and GLX xorg modules: by default DRI is activated,
# these modules are required by the fglrx_drv.so xorg driver
$(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/modules/dri/fglrx_dri.so \
$(TARGET_DIR)/usr/lib/dri/fglrx_dri.so
$(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/extensions/fglrx/fglrx-libglx.so \
$(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so
$(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/glesx.so \
$(TARGET_DIR)/usr/lib/xorg/modules/glesx.so
# Userspace GL libraries, also runtime dependency of most of the cmdline
# tools
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/*.so \
$(TARGET_DIR)/usr/lib/
$(call AMD_CATALYST_INSTALL_GL_LIBS,$(TARGET_DIR))
# Runtime dependency required by libfglrxdrm.so
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/libatiuki.so.1.0 \
$(TARGET_DIR)/usr/lib/
ln -sf libatiuki.so.1.0 \
$(TARGET_DIR)/usr/lib/libatiuki.so.1
endef
endif
ifeq ($(BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS), y)
AMD_CATALYST_CMDLINE_TOOLS_FILES = \
atiode \
atiodcli \
fgl_glxgears \
aticonfig \
amd-console-helper \
fglrxinfo
define AMD_CATALYST_INSTALL_CMDLINE_TOOLS
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/atieventsd \
$(TARGET_DIR)/usr/sbin
$(foreach f,$(AMD_CATALYST_CMDLINE_TOOLS_FILES), \
$(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/$(f) \
$(TARGET_DIR)/usr/bin/$(f)
)
endef
endif
define AMD_CATALYST_INSTALL_STAGING_CMDS
$(call AMD_CATALYST_INSTALL_STAGING_XORG)
endef
define AMD_CATALYST_INSTALL_TARGET_CMDS
$(call AMD_CATALYST_INSTALL_XORG)
$(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS)
$(call AMD_CATALYST_INSTALL_OPENCL)
endef
$(eval $(generic-package))

12
package/amd-catalyst/gl.pc
View File

@ -1,12 +0,0 @@
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: gl
Description: AMD Catalyst OpenGL library
Version: 15.9
Libs: -L${libdir} -lGL -lm -lXext -lX11 -ldl
Cflags: -I${includedir}
glx_tls: no

2
package/botan/botan.hash
View File

@ -1,4 +1,4 @@
# From https://botan.randombit.net/releases/sha256sums.txt
sha256 0c10f12b424a40ee19bde00292098e201d7498535c062d8d5b586d07861a54b5 Botan-2.14.0.tar.xz
sha256 d88af1307f1fefac79aa4f2f524699478d69ce15a857cf2d0a90ac6bf2a50009 Botan-2.15.0.tar.xz
# Locally computed
sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt

2
package/botan/botan.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
BOTAN_VERSION = 2.14.0
BOTAN_VERSION = 2.15.0
BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz
BOTAN_SITE = http://botan.randombit.net/releases
BOTAN_LICENSE = BSD-2-Clause

4
package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch
View File

@ -5,7 +5,9 @@ Subject: [PATCH] Makefile.flags: strip non -l arguments returned by pkg-config
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[yann.morin.1998@free.fr: refresh for 1.29.0]
[petr.vorel@gmail.com: refresh for 1.32.0]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Makefile.flags | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
@ -14,7 +16,7 @@ diff --git a/Makefile.flags b/Makefile.flags
index 307afa7..885e323 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -153,7 +153,9 @@ ifeq ($(CONFIG_SELINUX),y)
@@ -176,7 +176,9 @@ ifeq ($(CONFIG_SELINUX),y)
SELINUX_PC_MODULES = libselinux libsepol
$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
CPPFLAGS += $(SELINUX_CFLAGS)

61
package/busybox/0003-date-Use-64-prefix-syscall-if-we-have-to.patch
View File

@ -1,61 +0,0 @@
From 29ba834ed7d968de0460f7fd87156d43d8120d8f Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Wed, 18 Sep 2019 09:28:49 -0700
Subject: [PATCH] date: Use 64 prefix syscall if we have to
Some 32-bit architectures no longer have the 32-bit time_t syscalls.
Instead they have suffixed syscalls that returns a 64-bit time_t. If
the architecture doesn't have the non-suffixed syscall and is using a
64-bit time_t let's use the suffixed syscall instead.
This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel
headers.
If an architecture only supports the suffixed syscalls, but is still
using a 32-bit time_t fall back to the libc call.
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
(cherry picked from commit b7b7452f292f03eefafa6fd1da9bcfc933dee15a)
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
coreutils/date.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/coreutils/date.c b/coreutils/date.c
index 3414d38ae..1e0a675ca 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -36,7 +36,7 @@
//config:# defaults to "no": stat's nanosecond field is a bit non-portable
//config:config FEATURE_DATE_NANO
//config: bool "Support %[num]N nanosecond format specifier"
-//config: default n # syscall(__NR_clock_gettime)
+//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64)
//config: depends on DATE
//config: select PLATFORM_LINUX
//config: help
@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, char **argv)
*/
#endif
} else {
-#if ENABLE_FEATURE_DATE_NANO
+#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime)
/* libc has incredibly messy way of doing this,
* typically requiring -lrt. We just skip all this mess */
syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts);
+#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64
+ /* Let's only support the 64 suffix syscalls for 64-bit time_t.
+ * This simplifies the code for us as we don't need to convert
+ * between 64-bit and 32-bit. We also don't have a way to
+ * report overflow errors here.
+ */
+ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts);
#else
time(&ts.tv_sec);
#endif
--
2.18.2

50
package/busybox/0004-time-Use-64-prefix-syscall-if-we-have-to.patch
View File

@ -1,50 +0,0 @@
From 88732c5593e16ef6177f6e6110132ed69b06d2eb Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Wed, 18 Sep 2019 09:28:50 -0700
Subject: [PATCH] time: Use 64 prefix syscall if we have to
Some 32-bit architectures no longer have the 32-bit time_t syscalls.
Instead they have suffixed syscalls that returns a 64-bit time_t. If
the architecture doesn't have the non-suffixed syscall and is using a
64-bit time_t let's use the suffixed syscall instead.
This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel
headers.
If an architecture only supports the suffixed syscalls, but is still
using a 32-bit time_t report a compilation error. This avoids us have to
deal with converting between 64-bit and 32-bit values. There are
currently no architectures where this is the case.
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
(cherry picked from commit 902d3992922fc8db8495d5fb30a4581711b60c62)
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
libbb/time.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/libbb/time.c b/libbb/time.c
index f9b8da0b3..821f9a24b 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp)
* typically requiring -lrt. We just skip all this mess */
static void get_mono(struct timespec *ts)
{
+#if defined(__NR_clock_gettime)
if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
+#elif __TIMESIZE == 64
+ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts))
+#else
+# error "We currently don't support architectures without " \
+ "the __NR_clock_gettime syscall and 32-bit time_t"
+#endif
bb_error_msg_and_die("clock_gettime(MONOTONIC) failed");
}
unsigned long long FAST_FUNC monotonic_ns(void)
--
2.18.2

50
package/busybox/0005-runsv-Use-64-prefix-syscall-if-we-have-to.patch
View File

@ -1,50 +0,0 @@
From 8f4b588eb9737c2c0d1b199c7e609d880e0858a8 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Wed, 18 Sep 2019 09:28:51 -0700
Subject: [PATCH] runsv: Use 64 prefix syscall if we have to
Some 32-bit architectures no longer have the 32-bit time_t syscalls.
Instead they have suffixed syscalls that returns a 64-bit time_t. If
the architecture doesn't have the non-suffixed syscall and is using a
64-bit time_t let's use the suffixed syscall instead.
This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel
headers.
If an architecture only supports the suffixed syscalls, but is still
using a 32-bit time_t report a compilation error. This avoids us have to
deal with converting between 64-bit and 32-bit values. There are
currently no architectures where this is the case.
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
(cherry picked from commit ad27d44ebe950335616f37e36863469dc181b455)
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
runit/runsv.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/runit/runsv.c b/runit/runsv.c
index ccc762d78..737909b0e 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -55,7 +55,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* typically requiring -lrt. We just skip all this mess */
static void gettimeofday_ns(struct timespec *ts)
{
+#if defined(__NR_clock_gettime)
syscall(__NR_clock_gettime, CLOCK_REALTIME, ts);
+#elif __TIMESIZE == 64
+ syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts);
+#else
+# error "We currently don't support architectures without " \
+ "the __NR_clock_gettime syscall and 32-bit time_t"
+#endif
}
#else
static void gettimeofday_ns(struct timespec *ts)
--
2.18.2

134
package/busybox/0006-Remove-syscall-wrappers-around-clock_gettime-closes-.patch
View File

@ -1,134 +0,0 @@
From 07375fc6fd5912f34a36a097dc679f6e0af23f8a Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 24 Oct 2019 16:26:55 +0200
Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091
12091 "Direct use of __NR_clock_gettime is not time64-safe".
function old new delta
runsv_main 1698 1712 +14
startservice 378 383 +5
get_mono 31 25 -6
date_main 932 926 -6
gettimeofday_ns 17 - -17
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
(cherry picked from commit be5a505d771a77c640acc35ceaa470c80e62f954)
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
Makefile.flags | 6 ++++--
coreutils/date.c | 16 +++-------------
libbb/time.c | 11 +----------
runit/runsv.c | 11 +----------
4 files changed, 9 insertions(+), 35 deletions(-)
diff --git a/Makefile.flags b/Makefile.flags
index 6f6142cc5..bea464753 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -129,10 +129,12 @@ endif
# fall back to using a temp file:
CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c)
ifeq ($(CRYPT_AVAILABLE),y)
-LDLIBS += m crypt
+LDLIBS += m rt crypt
else
-LDLIBS += m
+LDLIBS += m rt
endif
+# libm may be needed for dc, awk, ntpd
+# librt may be needed for clock_gettime()
# libpam may use libpthread, libdl and/or libaudit.
# On some platforms that requires an explicit -lpthread, -ldl, -laudit.
diff --git a/coreutils/date.c b/coreutils/date.c
index 1e0a675ca..e479c23a2 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -33,10 +33,9 @@
//config: Enable option (-I) to output an ISO-8601 compliant
//config: date/time string.
//config:
-//config:# defaults to "no": stat's nanosecond field is a bit non-portable
//config:config FEATURE_DATE_NANO
//config: bool "Support %[num]N nanosecond format specifier"
-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64)
+//config: default n # stat's nanosecond field is a bit non-portable
//config: depends on DATE
//config: select PLATFORM_LINUX
//config: help
@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, char **argv)
*/
#endif
} else {
-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime)
- /* libc has incredibly messy way of doing this,
- * typically requiring -lrt. We just skip all this mess */
- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts);
-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64
- /* Let's only support the 64 suffix syscalls for 64-bit time_t.
- * This simplifies the code for us as we don't need to convert
- * between 64-bit and 32-bit. We also don't have a way to
- * report overflow errors here.
- */
- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts);
+#if ENABLE_FEATURE_DATE_NANO
+ clock_gettime(CLOCK_REALTIME, &ts);
#else
time(&ts.tv_sec);
#endif
diff --git a/libbb/time.c b/libbb/time.c
index 821f9a24b..1077bfa4f 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp)
#define CLOCK_MONOTONIC 1
#endif
-/* libc has incredibly messy way of doing this,
- * typically requiring -lrt. We just skip all this mess */
static void get_mono(struct timespec *ts)
{
-#if defined(__NR_clock_gettime)
- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
-#elif __TIMESIZE == 64
- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts))
-#else
-# error "We currently don't support architectures without " \
- "the __NR_clock_gettime syscall and 32-bit time_t"
-#endif
+ if (clock_gettime(CLOCK_MONOTONIC, ts))
bb_error_msg_and_die("clock_gettime(MONOTONIC) failed");
}
unsigned long long FAST_FUNC monotonic_ns(void)
diff --git a/runit/runsv.c b/runit/runsv.c
index 737909b0e..36d85101e 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -51,18 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if ENABLE_MONOTONIC_SYSCALL
#include <sys/syscall.h>
-/* libc has incredibly messy way of doing this,
- * typically requiring -lrt. We just skip all this mess */
static void gettimeofday_ns(struct timespec *ts)
{
-#if defined(__NR_clock_gettime)
- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts);
-#elif __TIMESIZE == 64
- syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts);
-#else
-# error "We currently don't support architectures without " \
- "the __NR_clock_gettime syscall and 32-bit time_t"
-#endif
+ clock_gettime(CLOCK_REALTIME, ts);
}
#else
static void gettimeofday_ns(struct timespec *ts)
--
2.18.2

97
package/busybox/0007-Remove-stime-function-calls.patch
View File

@ -1,97 +0,0 @@
From 59102e499ac25c4311246d2b9417b3e5830cf851 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Tue, 19 Nov 2019 13:06:40 +0100
Subject: [PATCH] Remove stime() function calls
stime() has been deprecated in glibc 2.31 and replaced with
clock_settime(). Let's replace the stime() function calls with
clock_settime() in preperation.
function old new delta
rdate_main 197 224 +27
clock_settime - 27 +27
date_main 926 941 +15
stime 37 - -37
------------------------------------------------------------------------------
(add/remove: 2/2 grow/shrink: 2/0 up/down: 69/-37) Total: 32 bytes
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
(cherry picked from commit d3539be8f27b8cbfdfee460fe08299158f08bcd9)
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
coreutils/date.c | 6 +++++-
libbb/missing_syscalls.c | 8 --------
util-linux/rdate.c | 8 ++++++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/coreutils/date.c b/coreutils/date.c
index e479c23a2..77a7d1368 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -276,6 +276,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
time(&ts.tv_sec);
#endif
}
+#if !ENABLE_FEATURE_DATE_NANO
+ ts.tv_nsec = 0;
+#endif
localtime_r(&ts.tv_sec, &tm_time);
/* If date string is given, update tm_time, and maybe set date */
@@ -298,9 +301,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
if (date_str[0] != '@')
tm_time.tm_isdst = -1;
ts.tv_sec = validate_tm_time(date_str, &tm_time);
+ ts.tv_nsec = 0;
/* if setting time, set it */
- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
+ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
bb_perror_msg("can't set date");
}
}
diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
index 87cf59b3d..dc40d9155 100644
--- a/libbb/missing_syscalls.c
+++ b/libbb/missing_syscalls.c
@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
return syscall(__NR_getsid, pid);
}
-int stime(const time_t *t)
-{
- struct timeval tv;
- tv.tv_sec = *t;
- tv.tv_usec = 0;
- return settimeofday(&tv, NULL);
-}
-
int sethostname(const char *name, size_t len)
{
return syscall(__NR_sethostname, name, len);
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 70f829e7f..878375d78 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
if (!(flags & 2)) { /* no -p (-s may be present) */
if (time(NULL) == remote_time)
bb_error_msg("current time matches remote time");
- else
- if (stime(&remote_time) < 0)
+ else {
+ struct timespec ts;
+ ts.tv_sec = remote_time;
+ ts.tv_nsec = 0;
+ if (clock_settime(CLOCK_REALTIME, &ts) < 0)
bb_perror_msg_and_die("can't set time of day");
+ }
}
if (flags != 1) /* not lone -s */
--
2.18.2

4
package/busybox/busybox.hash
View File

@ -1,4 +1,4 @@
# From https://busybox.net/downloads/busybox-1.31.1.tar.bz2.sha256
sha256 d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 busybox-1.31.1.tar.bz2
# From https://busybox.net/downloads/busybox-1.32.0.tar.bz2.sha256
sha256 c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 busybox-1.32.0.tar.bz2
# Locally computed
sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE

3
package/busybox/busybox.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
BUSYBOX_VERSION = 1.31.1
BUSYBOX_VERSION = 1.32.0
BUSYBOX_SITE = http://www.busybox.net/downloads
BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
BUSYBOX_LICENSE = GPL-2.0
@ -67,6 +67,7 @@ BUSYBOX_DEPENDENCIES = \
$(if $(BR2_PACKAGE_USBUTILS),usbutils) \
$(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \
$(if $(BR2_PACKAGE_VIM),vim) \
$(if $(BR2_PACKAGE_WATCHDOG),watchdog) \
$(if $(BR2_PACKAGE_WGET),wget) \
$(if $(BR2_PACKAGE_WHOIS),whois)

8
package/c-capnproto/Config.in
View File

@ -6,6 +6,8 @@ config BR2_PACKAGE_C_CAPNPROTO
depends on BR2_INSTALL_LIBSTDCPP # capnproto
depends on BR2_TOOLCHAIN_HAS_THREADS # capnproto
depends on BR2_TOOLCHAIN_HAS_ATOMIC # capnproto
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # capnproto
depends on BR2_TOOLCHAIN_HAS_UCONTEXT # capnproto
select BR2_PACKAGE_CAPNPROTO
help
A C plugin for Cap'n Proto. Generates the code generator
@ -14,10 +16,12 @@ config BR2_PACKAGE_C_CAPNPROTO
https://github.com/opensourcerouting/c-capnproto
comment "c-capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic"
comment "c-capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735"
depends on BR2_USE_MMU
depends on!BR2_HOST_GCC_AT_LEAST_5 || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \
!BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HAS_ATOMIC
!BR2_TOOLCHAIN_HAS_ATOMIC || \
BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \
!BR2_TOOLCHAIN_HAS_UCONTEXT

2
package/cage/cage.hash
View File

@ -1,5 +1,5 @@
# Generated locally
sha256 2f9bc2bd3c61cddb0d3b406754c4906eabf5a5d1aade26eb361dffccff2601e3 cage-6eb693c05b5b34d4ed5ad8234a9f79a14ac8e07d.tar.gz
sha256 38a3e3968f00cc58fe1d9448e972cfac7d1efa30c48699f09032f264101a55ac cage-0.1.2.1.tar.gz
# Hashes for license files:
sha256 e117104073335dbaf78596fb1bedf89dda63c71f60f0b665947b2d369c77ecee LICENSE

4
package/cage/cage.mk
View File

@ -4,8 +4,8 @@
#
################################################################################
CAGE_VERSION = 6eb693c05b5b34d4ed5ad8234a9f79a14ac8e07d
CAGE_SITE = $(call github,Hjdskes,cage,$(CAGE_VERSION))
CAGE_VERSION = 0.1.2.1
CAGE_SITE = https://github.com/Hjdskes/cage/releases/download/v$(CAGE_VERSION)
CAGE_LICENSE = MIT
CAGE_LICENSE_FILES = LICENSE
CAGE_DEPENDENCIES = host-pkgconf wlroots

8
package/capnproto/Config.in
View File

@ -6,6 +6,8 @@ config BR2_PACKAGE_CAPNPROTO
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735
depends on BR2_TOOLCHAIN_HAS_UCONTEXT
help
Cap'n Proto is an insanely fast data interchange format
and capability-based RPC system. Think JSON, except
@ -15,10 +17,12 @@ config BR2_PACKAGE_CAPNPROTO
https://capnproto.org/index.html
comment "capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic"
comment "capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735"
depends on BR2_USE_MMU
depends on !BR2_HOST_GCC_AT_LEAST_5 || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \
!BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HAS_ATOMIC
!BR2_TOOLCHAIN_HAS_ATOMIC || \
BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \
!BR2_TOOLCHAIN_HAS_UCONTEXT

2
package/capnproto/capnproto.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 76c7114a3d142ad08b7208b3964a26e72a6320ee81331d3f0b87569fc9c47a28 capnproto-0.7.0.tar.gz
sha256 6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820 capnproto-0.8.0.tar.gz
sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE

2
package/capnproto/capnproto.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
CAPNPROTO_VERSION = 0.7.0
CAPNPROTO_VERSION = 0.8.0
CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION))
CAPNPROTO_LICENSE = MIT
CAPNPROTO_LICENSE_FILES = LICENSE

11
package/collectd/Config.in
View File

@ -386,6 +386,17 @@ config BR2_PACKAGE_COLLECTD_NTPD
help
Queries an NTP server and extracts parameters.
config BR2_PACKAGE_COLLECTD_NUT
bool "nut"
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_NUT
help
The NUT plugin collects uninterruptible power supply (UPS)
statistics using the Network UPS Tools (NUT).
comment "nut needs a toolchain w/ C++"
depends on !BR2_INSTALL_LIBSTDCPP
config BR2_PACKAGE_COLLECTD_OLSRD
bool "olsrd"
help

4
package/collectd/collectd.mk
View File

@ -18,7 +18,7 @@ COLLECTD_PLUGINS_DISABLE = \
apple_sensors aquaero ascent barometer dbi dpdkstat email \
gmond hddtemp intel_rdt ipmi java lpar \
madwifi mbmon mic multimeter netapp notify_desktop numa \
nut oracle perl pf pinba powerdns python routeros \
oracle perl pf pinba powerdns python routeros \
rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
tokyotyrant turbostat uuid varnish virt vserver write_kafka \
write_mongodb xencpu xmms zfs_arc zone
@ -106,6 +106,7 @@ COLLECTD_CONF_OPTS += \
$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),--enable-notify_email,--disable-notify_email) \
$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_NAGIOS),--enable-notify_nagios,--disable-notify_nagios) \
$(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \
$(if $(BR2_PACKAGE_COLLECTD_NUT),--enable-nut,--disable-nut) \
$(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \
$(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),--enable-onewire,--disable-onewire) \
$(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),--enable-openldap,--disable-openldap) \
@ -174,6 +175,7 @@ COLLECTD_DEPENDENCIES = \
$(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \
$(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \
$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \
$(if $(BR2_PACKAGE_COLLECTD_NUT),nut) \
$(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),owfs) \
$(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),openldap) \
$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \

6
package/docker-cli/docker-cli.mk
View File

@ -6,7 +6,6 @@
DOCKER_CLI_VERSION = 19.03.11
DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION))
DOCKER_CLI_WORKSPACE = gopath
DOCKER_CLI_LICENSE = Apache-2.0
DOCKER_CLI_LICENSE_FILES = LICENSE
@ -15,10 +14,11 @@ DOCKER_CLI_DEPENDENCIES = host-pkgconf
DOCKER_CLI_TAGS = autogen
DOCKER_CLI_BUILD_TARGETS = cmd/docker
DOCKER_CLI_GOMOD = github.com/docker/cli
DOCKER_CLI_LDFLAGS = \
-X github.com/docker/cli/cli/version.GitCommit=$(DOCKER_CLI_VERSION) \
-X github.com/docker/cli/cli/version.Version=$(DOCKER_CLI_VERSION)
-X $(DOCKER_CLI_GOMOD)/cli/version.GitCommit=$(DOCKER_CLI_VERSION) \
-X $(DOCKER_CLI_GOMOD)/cli/version.Version=$(DOCKER_CLI_VERSION)
ifeq ($(BR2_PACKAGE_DOCKER_CLI_STATIC),y)
DOCKER_CLI_LDFLAGS += -extldflags '-static'

2
package/docker-containerd/docker-containerd.mk
View File

@ -9,7 +9,7 @@ DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINER
DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
DOCKER_CONTAINERD_WORKSPACE = vendor
DOCKER_CONTAINERD_GOMOD = github.com/containerd/containerd
DOCKER_CONTAINERD_LDFLAGS = \
-X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)

2
package/docker-engine/docker-engine.mk
View File

@ -11,7 +11,7 @@ DOCKER_ENGINE_LICENSE = Apache-2.0
DOCKER_ENGINE_LICENSE_FILES = LICENSE
DOCKER_ENGINE_DEPENDENCIES = host-pkgconf
DOCKER_ENGINE_SRC_SUBDIR = github.com/docker/docker
DOCKER_ENGINE_GOMOD = github.com/docker/docker
DOCKER_ENGINE_LDFLAGS = \
-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \

2
package/docker-proxy/docker-proxy.mk
View File

@ -12,8 +12,6 @@ DOCKER_PROXY_LICENSE_FILES = LICENSE
DOCKER_PROXY_DEPENDENCIES = host-pkgconf
DOCKER_PROXY_WORKSPACE = gopath
DOCKER_PROXY_BUILD_TARGETS = cmd/proxy
define DOCKER_PROXY_INSTALL_TARGET_CMDS

5
package/easydbus/Config.in
View File

@ -3,12 +3,13 @@ config BR2_PACKAGE_EASYDBUS
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # libglib2
depends on !BR2_PACKAGE_LUA_5_4
select BR2_PACKAGE_LIBGLIB2
help
Easy to use DBus library for Lua.
https://github.com/mniestroj/easydbus
comment "easydbus needs a toolchain w/ wchar, threads"
comment "easydbus needs a toolchain w/ wchar, threads, Lua <= 5.3"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PACKAGE_LUA_5_4

10
package/easyframes/Config.in Normal file
View File

@ -0,0 +1,10 @@
config BR2_PACKAGE_EASYFRAMES
bool "easyframes"
select BR2_PACKAGE_LIBPCAP
help
This is a small and simple command-line tool for network
testing. The tool makes it simple to compose a frame,
inject and express what and where frames are expected to be
received.
https://github.com/microchip-ung/easyframes

3
package/easyframes/easyframes.hash Normal file
View File

@ -0,0 +1,3 @@
# locally calculated
sha256 3c0449b3129c29b5ecf67b689f1a75ffc65fde3c5f62811e2f0439ce4f4af392 easyframes-0.3.tar.gz
sha256 24f37598e822a1411fb7164ce7eb3ef120aea8279016399abc282c2381ce3f57 COPYING

13
package/easyframes/easyframes.mk Normal file
View File

@ -0,0 +1,13 @@
################################################################################
#
# easyframes
#
################################################################################
EASYFRAMES_VERSION = 0.3
EASYFRAMES_SITE = $(call github,microchip-ung,easyframes,v$(EASYFRAMES_VERSION))
EASYFRAMES_DEPENDENCIES = libpcap
EASYFRAMES_LICENSE = MIT
EASYFRAMES_LICENSE_FILES = COPYING
$(eval $(cmake-package))

1
package/eudev/Config.in
View File

@ -7,6 +7,7 @@ config BR2_PACKAGE_EUDEV
select BR2_PACKAGE_HAS_UDEV
select BR2_PACKAGE_UDEV_GENTOO_SCRIPTS if BR2_INIT_OPENRC
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBS
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
select BR2_PACKAGE_KMOD
help

10
package/eudev/eudev.mk
View File

@ -18,7 +18,8 @@ EUDEV_CONF_OPTS = \
--enable-kmod \
--enable-blkid
EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod
# eudev requires only the util-linux libraries at build time
EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux-libs kmod
EUDEV_PROVIDES = udev
ifeq ($(BR2_ROOTFS_MERGED_USR),)
@ -54,13 +55,6 @@ define EUDEV_INSTALL_INIT_OPENRC
@:
endef
# Required by default rules for input devices
define EUDEV_USERS
- - input -1 * - - - Input device group
- - render -1 * - - - DRI rendering nodes
- - kvm -1 * - - - kvm nodes
endef
HOST_EUDEV_DEPENDENCIES = host-gperf host-pkgconf
HOST_EUDEV_SYSCONFDIR = $(if $(BR2_PACKAGE_SYSTEMD),/usr/lib,/etc)

2
package/exfatprogs/exfatprogs.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 e73863d2f27901834e0dae678ecbb3d899e206d6036cca27d9b24b9479487f65 exfatprogs-1.0.3.tar.gz
sha256 982883f208a694962dff0654f4421a1a726d7d71068a0c84b93a10688179a186 exfatprogs-1.0.4.tar.gz
sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING

2
package/exfatprogs/exfatprogs.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
EXFATPROGS_VERSION = 1.0.3
EXFATPROGS_VERSION = 1.0.4
EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION)
EXFATPROGS_LICENSE = GPL-2.0+
EXFATPROGS_LICENSE_FILES = COPYING

2
package/freeswitch/Config.in
View File

@ -16,6 +16,8 @@ config BR2_PACKAGE_FREESWITCH
select BR2_PACKAGE_OPENCV_LIB_OBJDETECT if BR2_PACKAGE_OPENCV
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_PCRE
select BR2_PACKAGE_SOFIA_SIP
select BR2_PACKAGE_SPANDSP
select BR2_PACKAGE_SPEEX
select BR2_PACKAGE_SPEEXDSP
select BR2_PACKAGE_SQLITE

11
package/freeswitch/freeswitch.hash
View File

@ -1,9 +1,5 @@
# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.3.-release.tar.xz.md5
md5 c7d570da3a6fc66c1a286a105680dabf freeswitch-1.10.3.-release.tar.xz
# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.3.-release.tar.xz.sha1
sha1 98139cda8054ec840611c6fc3a585a5c5565ae4d freeswitch-1.10.3.-release.tar.xz
# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.3.-release.tar.xz.sha256
sha256 2d7db07a64ee2f19f9b6e3a4ce76fa42e0fe46c29d95edf1b690a3df3729f307 freeswitch-1.10.3.-release.tar.xz
# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.5.-release.tar.xz.sha256
sha256 3e26600767a82946eca94af2c8f14712783aa83db5fb1cc57585f544aecce327 freeswitch-1.10.5.-release.tar.xz
# Locally computed
sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING
sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt
@ -12,8 +8,5 @@ sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/a
sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE
sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE
sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c
sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 libs/sofia-sip/COPYING
sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 libs/sofia-sip/COPYRIGHTS
sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a libs/spandsp/COPYING
sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE
sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE

9
package/freeswitch/freeswitch.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
FREESWITCH_VERSION = 1.10.3
FREESWITCH_VERSION = 1.10.5
FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz
FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases
# External modules need headers/libs from staging
@ -12,17 +12,12 @@ FREESWITCH_INSTALL_STAGING = YES
FREESWITCH_LICENSE = MPL-1.1, \
GPL-3.0+ with font exception (fonts), \
Apache-2.0 (apr, apr-util), \
LGPL-2.0+ (sofia-sip), \
LGPL-2.1, GPL-2.0 (spandsp), \
BSD-3-Clause (libsrtp)
FREESWITCH_LICENSE_FILES = \
COPYING \
libs/apr/LICENSE \
libs/apr-util/LICENSE \
libs/sofia-sip/COPYING \
libs/sofia-sip/COPYRIGHTS \
libs/spandsp/COPYING \
libs/srtp/LICENSE
# required dependencies
@ -32,6 +27,8 @@ FREESWITCH_DEPENDENCIES = \
libcurl \
openssl \
pcre \
spandsp \
sofia-sip \
speex \
sqlite \
tiff \

25
package/frr/Config.in Normal file
View File

@ -0,0 +1,25 @@
config BR2_PACKAGE_FRR
bool "frr"
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_STATIC_LIBS # libyang
depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
select BR2_PACKAGE_BASH
select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash
select BR2_PACKAGE_C_ARES
select BR2_PACKAGE_LIBYANG
select BR2_PACKAGE_LIBNL
select BR2_PACKAGE_READLINE
select BR2_PACKAGE_JSON_C
help
The FRRouting Protocol Suite.
FRR is free software that implements and manages various
IPv4 and IPv6 routing protocols.
https://frrouting.org
comment "frr needs a toolchain w/ threads, dynamic library"
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

46
package/frr/S50frr Normal file
View File

@ -0,0 +1,46 @@
#!/bin/sh
DAEMON="frr"
[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
start() {
install -m 755 -o frr -g frr -d /var/run/frr
install -m 755 -o frr -g frr -d /var/log/frr
printf 'Starting %s: ' "$DAEMON"
/usr/sbin/frrinit.sh start
status=$?
if [ "$status" -eq 0 ]; then
echo "OK"
else
echo "FAIL"
fi
return "$status"
}
stop() {
printf 'Stopping %s: ' "$DAEMON"
/usr/sbin/frrinit.sh stop
status=$?
if [ "$status" -eq 0 ]; then
echo "OK"
else
echo "FAIL"
fi
return "$status"
}
restart() {
stop
sleep 1
start
}
case "$1" in
start|stop|restart)
"$1";;
*)
echo "Usage: $0 {start|stop|restart}"
exit 1
esac

3
package/frr/frr.hash Normal file
View File

@ -0,0 +1,3 @@
# Locally calculated
sha256 3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a frr-7.4.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

66
package/frr/frr.mk Normal file
View File

@ -0,0 +1,66 @@
################################################################################
#
# frr
#
################################################################################
FRR_VERSION = 7.4
FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION))
FRR_LICENSE = GPL-2.0
FRR_LICENSE_FILES = COPYING
FRR_AUTORECONF = YES
FRR_DEPENDENCIES = host-frr readline json-c \
libyang libnl c-ares
HOST_FRR_DEPENDENCIES = host-flex host-bison host-python3
FRR_CONF_OPTS = --with-clippy=$(HOST_DIR)/bin/clippy \
--sysconfdir=/etc/frr \
--localstatedir=/var/run/frr \
--with-moduledir=/usr/lib/frr/modules \
--enable-configfile-mask=0640 \
--enable-logfile-mask=0640 \
--enable-multipath=256 \
--disable-ospfclient \
--enable-shell-access \
--enable-user=frr \
--enable-group=frr \
--enable-vty-group=frrvty \
--disable-capabilities \
--enable-fpm
HOST_FRR_CONF_OPTS = --enable-clippy-only
define HOST_FRR_INSTALL_CMDS
$(INSTALL) -D -m 0755 $(@D)/lib/clippy $(HOST_DIR)/bin/clippy
endef
define FRR_INSTALL_CONFIG_FILES
$(foreach f,daemons daemons.conf frr.conf vtysh.conf support_bundle_commands.conf,\
$(INSTALL) -D -m 0640 $(@D)/tools/etc/frr/$(f) \
$(TARGET_DIR)/etc/frr/$(f)
)
$(RM) $(TARGET_DIR)/etc/frr/*.sample
endef
FRR_POST_INSTALL_TARGET_HOOKS += FRR_INSTALL_CONFIG_FILES
define FRR_PERMISSIONS
/etc/frr/daemons f 640 frr frr - - - - -
/etc/frr/daemons.conf f 640 frr frr - - - - -
/etc/frr/frr.conf f 640 frr frr - - - - -
/etc/frr/vtysh.conf f 640 frr frrvty - - - - -
/etc/frr/support_bundle_commands.conf f 640 frr frr
endef
define FRR_USERS
frr -1 frr -1 * /var/run/frr - frrvty FRR user priv
endef
define FRR_INSTALL_INIT_SYSV
$(INSTALL) -D -m 755 $(FRR_PKGDIR)/S50frr \
$(TARGET_DIR)/etc/init.d/S50frr
endef
$(eval $(autotools-package))
$(eval $(host-autotools-package))

172
package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch
View File

@ -1,172 +0,0 @@
From 083849deeeec2854b2657b46380273ee13f4fa1b Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@redhat.com>
Date: Wed, 12 Sep 2018 13:16:02 -0400
Subject: [PATCH] Move 'is_regular_file' from common-utils.c to filestuff.c
There is no reason for 'is_regular_file' to be in common-utils.c; it
belongs to 'filestuff.c'. This commit moves the function definition
and its prototype to the appropriate files.
The motivation behind this move is a failure that happens on certain
cross-compilation environments when compiling the IPA library, due to
the way gnulib probes the need for a 'stat' call replacement. Because
configure checks when cross-compiling are more limited, gnulib decides
that it needs to substitute the 'stat' calls its own 'rpl_stat';
however, the IPA library doesn't link with gnulib, which leads to an
error when compiling 'common-utils.c':
...
/opt/x86-core2--musl--bleeding-edge-2018.09-1/bin/i686-buildroot-linux-musl-g++ -shared -fPIC -Wl,--soname=libinproctrace.so -Wl,--no-undefined -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -I. -I. -I./../common -I./../regformats -I./.. -I./../../include -I./../gnulib/import -Ibuild-gnulib-gdbserver/import -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable -Wno-sign-compare -Wno-narrowing -Wno-error=maybe-uninitialized -DGDBSERVER \
-Wl,--dynamic-list=./proc-service.list -o libinproctrace.so ax-ipa.o common-utils-ipa.o errors-ipa.o format-ipa.o print-utils-ipa.o regcache-ipa.o remote-utils-ipa.o rsp-low-ipa.o tdesc-ipa.o tracepoint-ipa.o utils-ipa.o vec-ipa.o linux-i386-ipa.o linux-x86-tdesc-ipa.o arch/i386-ipa.o -ldl -pthread
/opt/x86-core2--musl--bleeding-edge-2018.09-1/lib/gcc/i686-buildroot-linux-musl/8.2.0/../../../../i686-buildroot-linux-musl/bin/ld: common-utils-ipa.o: in function `is_regular_file(char const*, int*)':
common-utils.c:(.text+0x695): undefined reference to `rpl_stat'
collect2: error: ld returned 1 exit status
Makefile:413: recipe for target 'libinproctrace.so' failed
make[1]: *** [libinproctrace.so] Error 1
...
More details can also be found at:
https://sourceware.org/ml/gdb-patches/2018-09/msg00304.html
The most simple fix for this problem is to move 'is_regular_file' to
'filestuff.c', which is not used by IPA. This ends up making the
files more logically organized as well, since 'is_regular_file' is a
file operation.
No regressions found.
gdb/ChangeLog:
2018-09-12 Sergio Durigan Junior <sergiodj@redhat.com>
* common/common-utils.c: Don't include '<sys/stat.h>'.
(is_regular_file): Move to...
* common/filestuff.c (is_regular_file): ... here.
* common/common-utils.h (is_regular_file): Move to...
* common/filestuff.h (is_regular_file): ... here.
(cherry picked from commit 3c025cfe5efc44eb4dfb03b53dca28e75096dd1e)
[Romain: backport to gdb 8.1 and remove ChangeLog enty]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
gdb/common/common-utils.c | 30 ------------------------------
gdb/common/common-utils.h | 5 -----
gdb/common/filestuff.c | 31 +++++++++++++++++++++++++++++++
gdb/common/filestuff.h | 5 +++++
4 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/gdb/common/common-utils.c b/gdb/common/common-utils.c
index 80de826ba78..90a06390141 100644
--- a/gdb/common/common-utils.c
+++ b/gdb/common/common-utils.c
@@ -20,7 +20,6 @@
#include "common-defs.h"
#include "common-utils.h"
#include "host-defs.h"
-#include <sys/stat.h>
#include <ctype.h>
/* The xmalloc() (libiberty.h) family of memory management routines.
@@ -411,32 +410,3 @@ stringify_argv (const std::vector<char *> &args)
}
/* See common/common-utils.h. */
-
-bool
-is_regular_file (const char *name, int *errno_ptr)
-{
- struct stat st;
- const int status = stat (name, &st);
-
- /* Stat should never fail except when the file does not exist.
- If stat fails, analyze the source of error and return true
- unless the file does not exist, to avoid returning false results
- on obscure systems where stat does not work as expected. */
-
- if (status != 0)
- {
- if (errno != ENOENT)
- return true;
- *errno_ptr = ENOENT;
- return false;
- }
-
- if (S_ISREG (st.st_mode))
- return true;
-
- if (S_ISDIR (st.st_mode))
- *errno_ptr = EISDIR;
- else
- *errno_ptr = EINVAL;
- return false;
-}
diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h
index 5408c354693..2320318de74 100644
--- a/gdb/common/common-utils.h
+++ b/gdb/common/common-utils.h
@@ -146,9 +146,4 @@ in_inclusive_range (T value, T low, T high)
return value >= low && value <= high;
}
-/* Return true if the file NAME exists and is a regular file.
- If the result is false then *ERRNO_PTR is set to a useful value assuming
- we're expecting a regular file. */
-extern bool is_regular_file (const char *name, int *errno_ptr);
-
#endif
diff --git a/gdb/common/filestuff.c b/gdb/common/filestuff.c
index f5a754ffa66..fa10165a7ca 100644
--- a/gdb/common/filestuff.c
+++ b/gdb/common/filestuff.c
@@ -417,3 +417,34 @@ make_cleanup_close (int fd)
*saved_fd = fd;
return make_cleanup_dtor (do_close_cleanup, saved_fd, xfree);
}
+
+/* See common/filestuff.h. */
+
+bool
+is_regular_file (const char *name, int *errno_ptr)
+{
+ struct stat st;
+ const int status = stat (name, &st);
+
+ /* Stat should never fail except when the file does not exist.
+ If stat fails, analyze the source of error and return true
+ unless the file does not exist, to avoid returning false results
+ on obscure systems where stat does not work as expected. */
+
+ if (status != 0)
+ {
+ if (errno != ENOENT)
+ return true;
+ *errno_ptr = ENOENT;
+ return false;
+ }
+
+ if (S_ISREG (st.st_mode))
+ return true;
+
+ if (S_ISDIR (st.st_mode))
+ *errno_ptr = EISDIR;
+ else
+ *errno_ptr = EINVAL;
+ return false;
+}
diff --git a/gdb/common/filestuff.h b/gdb/common/filestuff.h
index 92a2a5f4c70..cc6dd861379 100644
--- a/gdb/common/filestuff.h
+++ b/gdb/common/filestuff.h
@@ -84,4 +84,9 @@ extern int gdb_pipe_cloexec (int filedes[2]);
extern struct cleanup *make_cleanup_close (int fd);
+/* Return true if the file NAME exists and is a regular file.
+ If the result is false then *ERRNO_PTR is set to a useful value assuming
+ we're expecting a regular file. */
+extern bool is_regular_file (const char *name, int *errno_ptr);
+
#endif /* FILESTUFF_H */
--
2.14.4

54
package/gdb/8.1.1/0007-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch
View File

@ -1,54 +0,0 @@
From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001
From: James Clarke <jrtc27@jrtc27.com>
Date: Fri, 19 Jan 2018 17:22:49 +0000
Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including
gdb_wait.h
On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
earlier; include it from linux-ptrace.h so it can never come afterwards.
gdb/ChangeLog:
* nat/linux-ptrace.c: Remove unnecessary reinclusion of
gdb_ptrace.h, and move including gdb_wait.h ...
* nat/linux-ptrace.h: ... to here.
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved (and updated to remove ChangeLog update) from:
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8]
---
gdb/ChangeLog | 6 ++++++
gdb/nat/linux-ptrace.c | 2 --
gdb/nat/linux-ptrace.h | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index 5c4ddc9..1f21ef0 100644
--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
@@ -21,8 +21,6 @@
#include "linux-procfs.h"
#include "linux-waitpid.h"
#include "buffer.h"
-#include "gdb_wait.h"
-#include "gdb_ptrace.h"
#ifdef HAVE_SYS_PROCFS_H
#include <sys/procfs.h>
#endif
diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
index 60967a3..dc180fb 100644
--- a/gdb/nat/linux-ptrace.h
+++ b/gdb/nat/linux-ptrace.h
@@ -21,6 +21,7 @@
struct buffer;
#include "nat/gdb_ptrace.h"
+#include "gdb_wait.h"
#ifdef __UCLIBC__
#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
--
2.9.3

42
package/gdb/8.1.1/0008-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch
View File

@ -1,42 +0,0 @@
From e00c211d51bec301cf04719b77076a8783ef44b5 Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul@tambre.ee>
Date: Sat, 4 May 2019 15:48:17 -0400
Subject: [PATCH] Fix incorrect use of 'is' operator for comparison in
python/lib/gdb/command/prompt.py
The 'is' operator is not meant to be used for comparisons. It currently working
is an implementation detail of CPython. CPython 3.8 has added a SyntaxWarning
for this.
(cherry picked from commit b6484282f85bf7f11451b2441599c241d302ad9d)
[Romain: backport to gdb 8.x]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
gdb/python/lib/gdb/command/prompt.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gdb/python/lib/gdb/command/prompt.py b/gdb/python/lib/gdb/command/prompt.py
index 3d662a7d3f..04b9e49c22 100644
--- a/gdb/python/lib/gdb/command/prompt.py
+++ b/gdb/python/lib/gdb/command/prompt.py
@@ -45,7 +45,7 @@ The currently defined substitutions are:
self.hook_set = False
def get_show_string (self, pvalue):
- if self.value is not '':
+ if self.value:
return "The extended prompt is: " + self.value
else:
return "The extended prompt is not set."
@@ -57,7 +57,7 @@ The currently defined substitutions are:
return ""
def before_prompt_hook(self, current):
- if self.value is not '':
+ if self.value:
return gdb.prompt.substitute_prompt(self.value)
else:
return None
--
2.25.4

24
package/gdb/8.1.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch → package/gdb/9.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
View File

@ -1,4 +1,4 @@
From 2acd9d3eb703b9a64ac92b3880ed546bec92af95 Mon Sep 17 00:00:00 2001
From 72ee19f54fd35595465b2e35eccf1f3d65fe21c6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 6 Aug 2016 17:32:50 -0700
Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems
@ -7,7 +7,7 @@ Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Rebase on gdb 8.0]
[Rebase on gdb 8.3]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
gdb/gdbserver/linux-ppc-low.c | 6 ++++++
@ -15,12 +15,12 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
2 files changed, 12 insertions(+)
diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
index 33a9feb..1a9141f 100644
index 1b695e53fe9..1978347c02c 100644
--- a/gdb/gdbserver/linux-ppc-low.c
+++ b/gdb/gdbserver/linux-ppc-low.c
@@ -21,7 +21,13 @@
#include "linux-low.h"
@@ -23,7 +23,13 @@
#include "elf/common.h"
#include <sys/uio.h>
#include <elf.h>
+#if !defined(__GLIBC__)
+# define pt_regs uapi_pt_regs
@ -30,15 +30,15 @@ index 33a9feb..1a9141f 100644
+# undef pt_regs
+#endif
#include "nat/ppc-linux.h"
#include "linux-ppc-tdesc.h"
#include "arch/ppc-linux-common.h"
#include "arch/ppc-linux-tdesc.h"
diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
index 5837ea1..7233929 100644
index f1561b3b357..40399361c09 100644
--- a/gdb/nat/ppc-linux.h
+++ b/gdb/nat/ppc-linux.h
@@ -18,7 +18,13 @@
#ifndef PPC_LINUX_H
#define PPC_LINUX_H 1
#ifndef NAT_PPC_LINUX_H
#define NAT_PPC_LINUX_H
+#if !defined(__GLIBC__)
+# define pt_regs uapi_pt_regs
@ -51,5 +51,5 @@ index 5837ea1..7233929 100644
/* This sometimes isn't defined. */
--
2.9.4
2.21.0

10
package/gdb/8.1.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch → package/gdb/9.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
View File

@ -1,8 +1,8 @@
From dfe4a40bc9d2fc1fd1b1a11ed733a0c0a1f59f3c Mon Sep 17 00:00:00 2001
From ef630288fdc2d4d22651702672f9d5c9cd767e5b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 3 Jun 2017 21:23:52 +0200
Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on
!GLIBC systems
Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC
systems
Fixes a pt_{dsp,}regs redefinition when building with the musl C library
on SuperH.
@ -19,7 +19,7 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
1 file changed, 8 insertions(+)
diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c
index ac084c9..08e104a 100644
index 0953721a190..c331c1382f7 100644
--- a/gdb/gdbserver/linux-sh-low.c
+++ b/gdb/gdbserver/linux-sh-low.c
@@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh;
@ -39,5 +39,5 @@ index ac084c9..08e104a 100644
#define sh_num_regs 41
--
2.9.4
2.21.0

6
package/gdb/8.1.1/0003-use-asm-sgidefs.h.patch → package/gdb/9.2/0003-use-asm-sgidefs.h.patch
View File

@ -1,4 +1,4 @@
From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001
From 19a0f664809b6858e69aa98188eb739415de044c Mon Sep 17 00:00:00 2001
From: Andre McCurdy <amccurdy@gmail.com>
Date: Sat, 30 Apr 2016 15:29:06 -0700
Subject: [PATCH] use <asm/sgidefs.h>
@ -23,7 +23,7 @@ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
index f2df1b9907..d24664cb56 100644
index e68ed1e4da9..bc42aa59685 100644
--- a/gdb/mips-linux-nat.c
+++ b/gdb/mips-linux-nat.c
@@ -31,7 +31,7 @@
@ -36,5 +36,5 @@ index f2df1b9907..d24664cb56 100644
#include <asm/ptrace.h>
#include "inf-ptrace.h"
--
2.13.1
2.21.0

6
package/gdb/8.1.1/0004-gdbserver-fix-build-for-m68k.patch → package/gdb/9.2/0004-gdbserver-fix-build-for-m68k.patch
View File

@ -1,4 +1,4 @@
From 80c60ea9fb3634272a98ec526eabff25f5255bae Mon Sep 17 00:00:00 2001
From 448e481aab86c823d908530038e20a14213db0a2 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 22 Jun 2018 22:40:26 +0200
Subject: [PATCH] gdbserver: fix build for m68k
@ -32,7 +32,7 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c
index 5594f10f927..19b4ef7b259 100644
index 16f639d02fc..969d9973737 100644
--- a/gdb/gdbserver/linux-m68k-low.c
+++ b/gdb/gdbserver/linux-m68k-low.c
@@ -17,16 +17,17 @@
@ -58,5 +58,5 @@ index 5594f10f927..19b4ef7b259 100644
#define m68k_num_gregs 18
--
2.14.4
2.21.0

16
package/gdb/8.1.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch → package/gdb/9.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch
View File

@ -1,4 +1,4 @@
From 887c667089e5417fdc7c5bbb364b027e86a7c113 Mon Sep 17 00:00:00 2001
From d84ecfa3a8c8fbade89229ac66c09f2a97ab00fb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Sun, 24 Jun 2018 23:33:55 +0200
Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h
@ -30,22 +30,24 @@ Fixes the following build issue:
vfork
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[Romain: rebase on gdb 8.3]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
gdb/nat/fork-inferior.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c
index 8b59387fa5..05167628a6 100644
index fe9360a5039..626fe7c1fbf 100644
--- a/gdb/nat/fork-inferior.c
+++ b/gdb/nat/fork-inferior.c
@@ -26,6 +26,7 @@
#include "common-gdbthread.h"
#include "signals-state-save-restore.h"
#include "gdb_tilde_expand.h"
@@ -27,6 +27,7 @@
#include "gdbsupport/pathstuff.h"
#include "gdbsupport/signals-state-save-restore.h"
#include "gdbsupport/gdb_tilde_expand.h"
+#include "linux-ptrace.h"
#include <vector>
extern char **environ;
--
2.14.4
2.21.0

10
package/gdb/Config.in.host
View File

@ -63,21 +63,21 @@ config BR2_PACKAGE_HOST_GDB_SIM
choice
prompt "GDB debugger Version"
default BR2_GDB_VERSION_8_2
default BR2_GDB_VERSION_8_3
depends on !BR2_arc
depends on !BR2_csky
help
Select the version of gdb you wish to use.
config BR2_GDB_VERSION_8_1
bool "gdb 8.1.x"
config BR2_GDB_VERSION_8_2
bool "gdb 8.2.x"
config BR2_GDB_VERSION_8_3
bool "gdb 8.3.x"
config BR2_GDB_VERSION_9_2
bool "gdb 9.2.x"
endchoice
endif
@ -87,7 +87,7 @@ config BR2_GDB_VERSION
string
default "arc-2020.03-release-gdb" if BR2_arc
default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky
default "8.1.1" if BR2_GDB_VERSION_8_1
default "8.2.1" if BR2_GDB_VERSION_8_2 || !BR2_PACKAGE_HOST_GDB
default "8.3.1" if BR2_GDB_VERSION_8_3
default "9.2" if BR2_GDB_VERSION_9_2
depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB

2
package/gdb/gdb.hash
View File

@ -1,7 +1,7 @@
# From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum
sha512 7dcd5e8c90de92f577834d887b5f54edb93a07083bfe661bc46c270a6cc4919f0b348e7e2fe8ae4511298a570ef150eeefdc667ef7cf527f0cf60943177ab6c9 gdb-8.1.1.tar.xz
sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz
sha512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz
sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz
# Locally calculated (fetched from Github)
sha512 74346a2a2b2082d35377711946b12c824222005c66813d5648350b101697eac67d3d01617e1daea03e41c196c2b7b4a4b225d1ee58af91dc69731bffed0e5d51 gdb-arc-2020.03-release-gdb.tar.gz

23
package/gdb/gdb.mk
View File

@ -26,10 +26,20 @@ GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB
# We only want gdbserver and not the entire debugger.
ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),)
GDB_SUBDIR = gdb/gdbserver
HOST_GDB_SUBDIR = .
else
GDB_DEPENDENCIES = ncurses \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
GDB_SUBDIR = build
# Since gdb 9, in-tree builds for GDB are not allowed anymore,
# so we create a 'build' subdirectory in the gdb sources, and
# build from there.
define GDB_CONFIGURE_SYMLINK
mkdir -p $(@D)/$(GDB_SUBDIR)
ln -sf ../configure $(@D)/$(GDB_SUBDIR)/configure
endef
GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK
endif
# For the host variant, we really want to build with XML support,
@ -251,6 +261,17 @@ else
HOST_GDB_CONF_OPTS += --disable-sim
endif
# Since gdb 9, in-tree builds for GDB are not allowed anymore,
# so we create a 'build' subdirectory in the gdb sources, and
# build from there.
HOST_GDB_SUBDIR = build
define HOST_GDB_CONFIGURE_SYMLINK
mkdir -p $(@D)/build
ln -sf ../configure $(@D)/build/configure
endef
HOST_GDB_PRE_CONFIGURE_HOOKS += HOST_GDB_CONFIGURE_SYMLINK
# legacy $arch-linux-gdb symlink
define HOST_GDB_ADD_SYMLINK
cd $(HOST_DIR)/bin && \

6
package/gensio/gensio.hash
View File

@ -1,7 +1,7 @@
# From https://sourceforge.net/projects/ser2net/files/ser2net/
md5 1281387def2b137f762ce4a8869fbb4f gensio-2.1.1.tar.gz
sha1 4fb43270449e1f2312be87e56aff8173d285e3f1 gensio-2.1.1.tar.gz
md5 e2547078bd73d62abda343515f1368ee gensio-2.1.4.tar.gz
sha1 f8c0e787fad22a71b10f1d8eefea83617f489bdb gensio-2.1.4.tar.gz
# Locally computed:
sha256 e81df2c55d8830ac4f3c28eda54c3f690c4b62e186ea3879815b101a4902a703 gensio-2.1.1.tar.gz
sha256 1f5a29aabfb35886893cfda5cd78192db67e96de796dbf9758dbecd4077a3fd8 gensio-2.1.4.tar.gz
sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING
sha256 dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89 COPYING.LIB

2
package/gensio/gensio.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GENSIO_VERSION = 2.1.1
GENSIO_VERSION = 2.1.4
GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
GENSIO_LICENSE_FILES = COPYING.LIB COPYING

34
package/gnuplot/0001-configure-add-without-demo-option.patch
View File

@ -3,14 +3,16 @@ Add options to enable/disable docs and demos
Originally written by Anthony Viallard
<viallard@syscom-instruments.com>.
[Vincent: adapt patch to 5.0.5 version]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Vincent: adapt patch to 5.0.5 version]
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
[Michael: adapt patch to 5.4.0 version]
Signed-off-by: Michael Fischer <mf@go-sys.de>
--- a/configure.ac 2019-11-27 23:52:29.000000000 +0100
+++ b/configure.ac 2020-02-13 10:24:50.801842269 +0100
@@ -755,6 +755,16 @@ if test "$with_cwdrc" = yes; then
diff -Naur a/configure.ac b/configure.ac
--- a/configure.ac 2020-07-12 02:29:47.000000000 +0200
+++ b/configure.ac 2020-08-06 14:21:17.918756893 +0200
@@ -713,6 +713,17 @@
[ Define if you want to read .gnuplot from current directory (SECURITY RISK!).])
fi
@ -24,10 +26,11 @@ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+AC_ARG_ENABLE(demo,dnl
+[ --disable-demo do not build demo files])
+
dnl Disable experimental support for nonlinear axes
AC_ARG_WITH(nonlinear-axes,dnl
[ --without-nonlinear-axes disable support for nonlinear axes])
@@ -1236,6 +1246,24 @@ if test -n "${DIST_CONTACT}"; then
+
dnl Sort help/subtopic tables by row or column
AC_ARG_WITH(row-help,dnl
[ --with-row-help format help and subtopic tables by row (default)
@@ -1095,6 +1106,24 @@
AC_DEFINE_UNQUOTED([DIST_CONTACT],["$DIST_CONTACT"],[Contact address for modified and binary distributed gnuplot versions])
fi
@ -52,14 +55,15 @@ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
dnl Substitute variables
AC_SUBST(PACKAGE)
AC_SUBST(VERSION_MAJOR)
--- a/Makefile.am 2019-11-19 22:57:18.000000000 +0100
+++ b/Makefile.am 2020-02-13 10:17:55.753012739 +0100
diff -Naur a/Makefile.am b/Makefile.am
--- a/Makefile.am 2020-03-31 19:28:16.000000000 +0200
+++ b/Makefile.am 2020-08-06 14:34:12.995097799 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = config m4 term src docs man demo tutorial share
+SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) tutorial share
-SUBDIRS = config m4 term src docs man demo share
+SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) share
EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \
EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \
PATCHLEVEL PGPKEYS README RELEASE_NOTES \

8
package/gnuplot/gnuplot.hash
View File

@ -1,6 +1,6 @@
# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.2.8/
md5 2df8767c7399bee57a96296d46b4d5fb gnuplot-5.2.8.tar.gz
sha1 dc018b1e0a31b770d4635958badff13498babc4d gnuplot-5.2.8.tar.gz
# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.0/
md5 ac586178f3b031dea82cd3890cefb21b gnuplot-5.4.0.tar.gz
sha1 b4660dff7d047a453c55fd77faba11f63bb2d5ed gnuplot-5.4.0.tar.gz
# Locally computed
sha256 60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37 gnuplot-5.2.8.tar.gz
sha256 eb4082f03a399fd1e9e2b380cf7a4f785e77023d8dcc7e17570c1b5570a49c47 gnuplot-5.4.0.tar.gz
sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright

2
package/gnuplot/gnuplot.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GNUPLOT_VERSION = 5.2.8
GNUPLOT_VERSION = 5.4.0
GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
GNUPLOT_LICENSE = gnuplot license (open source)
GNUPLOT_LICENSE_FILES = Copyright

30
package/go/go.mk
View File

@ -12,10 +12,23 @@ GO_LICENSE = BSD-3-Clause
GO_LICENSE_FILES = LICENSE
HOST_GO_DEPENDENCIES = host-go-bootstrap
HOST_GO_GOPATH = $(HOST_DIR)/usr/share/go-path
HOST_GO_HOST_CACHE = $(HOST_DIR)/usr/share/host-go-cache
HOST_GO_ROOT = $(HOST_DIR)/lib/go
HOST_GO_TARGET_CACHE = $(HOST_DIR)/usr/share/go-cache
# We pass an empty GOBIN, otherwise "go install: cannot install
# cross-compiled binaries when GOBIN is set"
HOST_GO_COMMON_ENV = \
GO111MODULE=on \
GOFLAGS=-mod=vendor \
GOROOT="$(HOST_GO_ROOT)" \
GOPATH="$(HOST_GO_GOPATH)" \
GOPROXY=off \
PATH=$(BR_PATH) \
GOBIN= \
CGO_ENABLED=$(HOST_GO_CGO_ENABLED)
ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y)
ifeq ($(BR2_arm),y)
@ -46,12 +59,14 @@ endif
# For the convienience of target packages.
HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH)
HOST_GO_TARGET_ENV = \
GO111MODULE=off \
$(HOST_GO_COMMON_ENV) \
GOARCH=$(GO_GOARCH) \
GOCACHE="$(HOST_GO_TARGET_CACHE)" \
GOROOT="$(HOST_GO_ROOT)" \
CC="$(TARGET_CC)" \
CXX="$(TARGET_CXX)" \
CGO_CFLAGS="$(TARGET_CFLAGS)" \
CGO_CXXFLAGS="$(TARGET_CXXFLAGS)" \
CGO_LDFLAGS="$(TARGET_LDFLAGS)" \
GOTOOLDIR="$(HOST_GO_TOOLDIR)"
# The go compiler's cgo support uses threads. If BR2_TOOLCHAIN_HAS_THREADS is
@ -77,6 +92,17 @@ else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
HOST_GO_CGO_ENABLED = 1
endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
# For the convenience of host golang packages
HOST_GO_HOST_ENV = \
$(HOST_GO_COMMON_ENV) \
GOARCH="" \
GOCACHE="$(HOST_GO_HOST_CACHE)" \
CC="$(HOST_CCNOCCACHE)" \
CXX="$(HOST_CXXNOCCACHE)" \
CGO_CFLAGS="$(HOST_CFLAGS)" \
CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \
CGO_LDFLAGS="$(HOST_LDFLAGS)"
# The go build system is not compatible with ccache, so use
# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685.
HOST_GO_MAKE_ENV = \

4
package/grpc/0001-target-build-using-host-plugin.patch
View File

@ -20,7 +20,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index be695c2..45c2fcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10844,6 +10844,18 @@ target_link_libraries(grpc_cli
@@ -11043,6 +11043,18 @@ target_link_libraries(grpc_cli
endif()
if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN)
@ -39,7 +39,7 @@ index be695c2..45c2fcb 100644
add_executable(grpc_cpp_plugin
src/compiler/cpp_plugin.cc
)
@@ -10877,6 +10889,7 @@ if(gRPC_INSTALL)
@@ -11077,6 +11089,7 @@ if(gRPC_INSTALL)
ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
)
endif()

7
package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch
View File

@ -20,7 +20,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45c2fcb..0b2be4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,6 +177,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
@@ -180,6 +180,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
@ -37,7 +37,7 @@ diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codeg
index 4f213ff..55ecd9d 100644
--- a/include/grpc/impl/codegen/port_platform.h
+++ b/include/grpc/impl/codegen/port_platform.h
@@ -195,7 +195,9 @@
@@ -163,7 +163,9 @@
#endif /* _LP64 */
#ifdef __GLIBC__
#define GPR_POSIX_CRASH_HANDLER 1
@ -48,5 +48,4 @@ index 4f213ff..55ecd9d 100644
#else /* musl libc */
#define GPR_MUSL_LIBC_COMPAT 1
--
2.26.2
2.26.63

3
package/grpc/Config.in
View File

@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf, re2
depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
@ -11,6 +11,7 @@ config BR2_PACKAGE_GRPC
select BR2_PACKAGE_LIBABSEIL_CPP
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_PROTOBUF
select BR2_PACKAGE_RE2
select BR2_PACKAGE_ZLIB
help
A language-neutral, platform-neutral, open source, remote

2
package/grpc/grpc.hash
View File

@ -1,3 +1,3 @@
# Locally computed
sha256 ba74b97a2f1b4e22ec5fb69d639d849d2069fb58ea7d6579a31f800af6fe3b6c grpc-1.30.2.tar.gz
sha256 1236514199d3deb111a6dd7f6092f67617cd2b147f7eda7adbafccea95de7381 grpc-1.31.0.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE

10
package/grpc/grpc.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GRPC_VERSION = 1.30.2
GRPC_VERSION = 1.31.0
GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION))
GRPC_LICENSE = Apache-2.0
GRPC_LICENSE_FILES = LICENSE
@ -12,9 +12,9 @@ GRPC_LICENSE_FILES = LICENSE
GRPC_INSTALL_STAGING = YES
# Need to use host grpc_cpp_plugin during cross compilation.
GRPC_DEPENDENCIES = c-ares host-grpc openssl protobuf zlib libabseil-cpp
HOST_GRPC_DEPENDENCIES = host-c-ares host-openssl host-protobuf host-zlib \
host-libabseil-cpp
GRPC_DEPENDENCIES = c-ares host-grpc openssl protobuf re2 zlib libabseil-cpp
HOST_GRPC_DEPENDENCIES = host-c-ares host-libabseil-cpp host-openssl host-protobuf \
host-re2 host-zlib
# gRPC_CARES_PROVIDER=package won't work because it requires c-ares to have
# installed a cmake config file, but buildroot uses c-ares' autotools build,
@ -24,6 +24,7 @@ GRPC_CONF_OPTS = \
-D_gRPC_CARES_LIBRARIES=cares \
-DgRPC_CARES_PROVIDER=none \
-DgRPC_PROTOBUF_PROVIDER=package \
-DgRPC_RE2_PROVIDER=package \
-DgRPC_SSL_PROVIDER=package \
-DgRPC_ZLIB_PROVIDER=package \
-DgRPC_ABSL_PROVIDER=package \
@ -66,6 +67,7 @@ HOST_GRPC_CONF_OPTS = \
-D_gRPC_CARES_LIBRARIES=cares \
-DgRPC_CARES_PROVIDER=none \
-DgRPC_PROTOBUF_PROVIDER=package \
-DgRPC_RE2_PROVIDER=package \
-DgRPC_SSL_PROVIDER=package \
-DgRPC_ZLIB_PROVIDER=package \
-DgRPC_ABSL_PROVIDER=package

4
package/gsl/gsl.hash
View File

@ -1,3 +1,3 @@
# Locally calculated after checking pgp signature
sha256 0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d gsl-2.5.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
sha256 b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8 gsl-2.6.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING

2
package/gsl/gsl.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GSL_VERSION = 2.5
GSL_VERSION = 2.6
GSL_SITE = $(BR2_GNU_MIRROR)/gsl
GSL_INSTALL_STAGING = YES
GSL_LICENSE = GPL-3.0

64
package/guile/0003-workaround-ice-ssa-corruption.patch
View File

@ -1,64 +0,0 @@
libguile/vm-i-system.c: workaround ice ssa corruption while compiling with option -g -O
While compiling with option -g -O, there was a ssa corruption:
..
Unable to coalesce ssa_names 48 and 3476 which are marked as MUST COALESCE.
sp_48(ab) and sp_3476(ab)
guile-2.0.11/libguile/vm-engine.c: In function 'vm_debug_engine':
guile-2.0.11/libguile/vm.c:673:19: internal compiler error: SSA corruption
#define VM_NAME vm_debug_engine
^
guile-2.0.11/libguile/vm-engine.c:39:1: note: in expansion of macro 'VM_NAME'
VM_NAME (SCM vm, SCM program, SCM *argv, int nargs)
^
Please submit a full bug report,
with preprocessed source if appropriate.
See <http://gcc.gnu.org/bugs.html> for instructions.
...
Tweak libguile/vm-i-system.c to add boundary value check to workaround it.
Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Fixes Buildroot autobuilder failures on AArch64.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
libguile/vm-i-system.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -625,10 +625,22 @@ VM_DEFINE_INSTRUCTION (47, bind_optionals_shuffle, "bind-optionals/shuffle", 6,
/* now shuffle up, from walk to ntotal */
{
scm_t_ptrdiff nshuf = sp - walk + 1, i;
- sp = (fp - 1) + ntotal + nshuf;
- CHECK_OVERFLOW ();
- for (i = 0; i < nshuf; i++)
- sp[-i] = walk[nshuf-i-1];
+ /* check the value of nshuf to workaround ice ssa corruption */
+ /* while compiling with -O -g */
+ if (nshuf > 0)
+ {
+ sp = (fp - 1) + ntotal + nshuf;
+ CHECK_OVERFLOW ();
+ for (i = 0; i < nshuf; i++)
+ sp[-i] = walk[nshuf-i-1];
+ }
+ else
+ {
+ sp = (fp - 1) + ntotal + nshuf;
+ CHECK_OVERFLOW ();
+ for (i = 0; i < nshuf; i++)
+ sp[-i] = walk[nshuf-i-1];
+ }
}
/* and fill optionals & keyword args with SCM_UNDEFINED */
while (walk <= (fp - 1) + ntotal)
--
1.9.1

2
package/guile/guile.hash
View File

@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
sha256 e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8619d82 guile-2.0.14.tar.xz
sha256 6b7947dc2e3d115983846a268b8f5753c12fd5547e42fbf2b97d75a3b79f0d31 guile-3.0.4.tar.xz
# Locally computed
sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING

2
package/guile/guile.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GUILE_VERSION = 2.0.14
GUILE_VERSION = 3.0.4
GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz
GUILE_SITE = $(BR2_GNU_MIRROR)/guile
GUILE_INSTALL_STAGING = YES

Some files were not shown because too many files have changed in this diff Show More