mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-08-02 17:57:42 +00:00
Compare commits
50 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
e648285fca | ||
![]() |
3cf1b78d55 | ||
![]() |
4dd3b8bc0d | ||
![]() |
918c14fce0 | ||
![]() |
d56344414b | ||
![]() |
6b51d5a8ab | ||
![]() |
5c2b6bd6e3 | ||
![]() |
103ddb150b | ||
![]() |
0e7310e8db | ||
![]() |
b4d587e53b | ||
![]() |
01923727d0 | ||
![]() |
8cc42b3adb | ||
![]() |
fe25d03b09 | ||
![]() |
e0f435bae1 | ||
![]() |
810de4efdb | ||
![]() |
5f41501292 | ||
![]() |
45d6d287e8 | ||
![]() |
14ddf8800e | ||
![]() |
33cc77eff0 | ||
![]() |
1bdccc83d9 | ||
![]() |
a0f63549f4 | ||
![]() |
f679638a9c | ||
![]() |
ac3017fc15 | ||
![]() |
c98e1557bb | ||
![]() |
4ffe277bcb | ||
![]() |
e1c1f052dc | ||
![]() |
6d5c41c682 | ||
![]() |
9e78409db8 | ||
![]() |
f649995a08 | ||
![]() |
6bbf0b382c | ||
![]() |
abfe9da03e | ||
![]() |
81275e7189 | ||
![]() |
9b81e50e19 | ||
![]() |
22a7f43875 | ||
![]() |
fa88a04722 | ||
![]() |
a48888a2df | ||
![]() |
c152fdeba0 | ||
![]() |
5583a16219 | ||
![]() |
639cd41ccf | ||
![]() |
9b3e5357c5 | ||
![]() |
d204cbda7f | ||
![]() |
7b14ed775b | ||
![]() |
1be8e44cde | ||
![]() |
3329912511 | ||
![]() |
3c469e6f27 | ||
![]() |
bbbaff117a | ||
![]() |
6c58a94a4d | ||
![]() |
2b89de39e3 | ||
![]() |
1ca4275698 | ||
![]() |
647a461a74 |
11
.github/workflows/release.yml
vendored
11
.github/workflows/release.yml
vendored
@ -92,6 +92,17 @@ jobs:
|
||||
asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
|
||||
asset_content_type: application/octet-stream
|
||||
|
||||
- name: Upload ova image
|
||||
if: ${{ matrix.board.name == 'ova' }}
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ github.event.release.upload_url }}
|
||||
asset_path: ${{ github.workspace }}/release/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
|
||||
asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
|
||||
asset_content_type: application/x-tar
|
||||
|
||||
- name: Upload qcow2 image
|
||||
if: ${{ matrix.board.name == 'ova' }}
|
||||
uses: actions/upload-release-asset@v1
|
||||
|
@ -5,15 +5,15 @@ Default Kernel tree: 5.4
|
||||
|
||||
| Board | Version |
|
||||
|-------|---------|
|
||||
| Open Virtual Appliance | 5.4.80 |
|
||||
| Open Virtual Appliance | 5.4.86 |
|
||||
| Raspberry Pi | 5.4.79 |
|
||||
| Raspberry Pi 0-W | 5.4.79 |
|
||||
| Raspberry Pi 2 | 5.4.79 |
|
||||
| Raspberry Pi 3 | 5.4.79 |
|
||||
| Raspberry Pi 4 | 5.4.79 |
|
||||
| Tinker Board | 5.4.80 |
|
||||
| Odroid-C2 | 5.9.11 |
|
||||
| Odroid-C4 | 5.9.11 |
|
||||
| Odroid-N2 | 5.9.11 |
|
||||
| Odroid-XU4 | 5.9.11 |
|
||||
| Intel NUC | 5.4.80 |
|
||||
| Tinker Board | 5.4.86 |
|
||||
| Odroid-C2 | 5.9.16 |
|
||||
| Odroid-C4 | 5.9.16 |
|
||||
| Odroid-N2 | 5.9.16 |
|
||||
| Odroid-XU4 | 5.9.16 |
|
||||
| Intel NUC | 5.4.86 |
|
||||
|
@ -5,3 +5,4 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
|
||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in"
|
||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/intel-e1000e/Config.in"
|
||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in"
|
||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl8812au/Config.in"
|
||||
|
@ -1253,7 +1253,7 @@ CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
|
||||
CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
|
||||
CONFIG_CFG80211_DEFAULT_PS=y
|
||||
CONFIG_CFG80211_CRDA_SUPPORT=y
|
||||
# CONFIG_CFG80211_WEXT is not set
|
||||
CONFIG_CFG80211_WEXT=y
|
||||
CONFIG_MAC80211=m
|
||||
CONFIG_MAC80211_HAS_RC=y
|
||||
CONFIG_MAC80211_RC_MINSTREL=y
|
||||
|
@ -1,8 +1,8 @@
|
||||
From 526ccae8321b9b48925c44999611c3c5a374328e Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <526ccae8321b9b48925c44999611c3c5a374328e.1607542946.git.stefan@agner.ch>
|
||||
From f9877c2895d6c05710a828d0cd46d9f25626b070 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
|
||||
From: Stefan Agner <stefan@agner.ch>
|
||||
Date: Mon, 31 Aug 2020 13:40:18 +0200
|
||||
Subject: [PATCH 1/3] ARM: meson: isolate loading of socinfo
|
||||
Subject: [PATCH 1/4] ARM: meson: isolate loading of socinfo
|
||||
|
||||
Move loading of socinfo into a separate function so the value can be
|
||||
reused later.
|
||||
@ -47,5 +47,5 @@ index 3abb27e03b..c585b12ca5 100644
|
||||
socinfo_to_soc_id(socinfo),
|
||||
socinfo_to_package_id(socinfo),
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
From 2b2ad8c105cbb5fb48c3c5f0512c031f6533d522 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <2b2ad8c105cbb5fb48c3c5f0512c031f6533d522.1607542946.git.stefan@agner.ch>
|
||||
In-Reply-To: <526ccae8321b9b48925c44999611c3c5a374328e.1607542946.git.stefan@agner.ch>
|
||||
References: <526ccae8321b9b48925c44999611c3c5a374328e.1607542946.git.stefan@agner.ch>
|
||||
From 31e32295dc261032d7f5540a0b7f79a4f5a5b807 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <31e32295dc261032d7f5540a0b7f79a4f5a5b807.1609421746.git.stefan@agner.ch>
|
||||
In-Reply-To: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
|
||||
References: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
|
||||
From: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
Date: Tue, 4 Aug 2020 13:50:57 +0000
|
||||
Subject: [PATCH 2/3] meson: Add board_rev to env
|
||||
Subject: [PATCH 2/4] meson: Add board_rev to env
|
||||
|
||||
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
||||
@ -78,5 +78,5 @@ index caf7fd6810..c2a191ba6a 100644
|
||||
|
||||
if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
From 0077176ac369a1125c3fb22f7ba8e5d53576a1b3 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <0077176ac369a1125c3fb22f7ba8e5d53576a1b3.1607542946.git.stefan@agner.ch>
|
||||
In-Reply-To: <526ccae8321b9b48925c44999611c3c5a374328e.1607542946.git.stefan@agner.ch>
|
||||
References: <526ccae8321b9b48925c44999611c3c5a374328e.1607542946.git.stefan@agner.ch>
|
||||
From 01ba1339ffd095b146b9d9d772aea6f2b3594a06 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <01ba1339ffd095b146b9d9d772aea6f2b3594a06.1609421746.git.stefan@agner.ch>
|
||||
In-Reply-To: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
|
||||
References: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Mon, 2 Sep 2019 15:42:04 +0200
|
||||
Subject: [PATCH 3/3] HACK: mmc: meson-gx: limit to 24MHz
|
||||
Subject: [PATCH 3/4] HACK: mmc: meson-gx: limit to 24MHz
|
||||
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
---
|
||||
@ -25,5 +25,5 @@ index 719dd1e5e5..dd3dd7c08c 100644
|
||||
cfg->name = dev->name;
|
||||
|
||||
--
|
||||
2.29.2
|
||||
2.30.0
|
||||
|
||||
|
@ -0,0 +1,43 @@
|
||||
From 26e152c0929702a9dfca4a8967601b59de77a57d Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <26e152c0929702a9dfca4a8967601b59de77a57d.1609421746.git.stefan@agner.ch>
|
||||
In-Reply-To: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
|
||||
References: <f9877c2895d6c05710a828d0cd46d9f25626b070.1609421746.git.stefan@agner.ch>
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Mon, 14 Dec 2020 19:39:07 +0100
|
||||
Subject: [PATCH 4/4] pinctrl: meson: fix bit manipulation of pin bias
|
||||
configuration
|
||||
|
||||
This fixes the wrong usage of clrsetbits_le32(), badly setting the set argument.
|
||||
|
||||
Fixes: c4c726c26b ("pinctrl: meson: add pinconf support")
|
||||
Reported-by: Anton Arapov <arapov@gmail.com>
|
||||
Reported-by: Otto Meier <gf435@gmx.net>
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
(cherry picked from commit 5ccd5d2cc98224108ae9fb09593a862c9caa5e80)
|
||||
---
|
||||
drivers/pinctrl/meson/pinctrl-meson.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
|
||||
index d4539b02d8..5065b62436 100644
|
||||
--- a/drivers/pinctrl/meson/pinctrl-meson.c
|
||||
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
|
||||
@@ -216,13 +216,13 @@ static int meson_pinconf_bias_set(struct udevice *dev, unsigned int pin,
|
||||
}
|
||||
|
||||
/* othewise, enable the bias and select level */
|
||||
- clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), 1);
|
||||
+ clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), BIT(bit));
|
||||
ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_PULL, ®, &bit);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
clrsetbits_le32(priv->reg_pull + reg, BIT(bit),
|
||||
- param == PIN_CONFIG_BIAS_PULL_UP);
|
||||
+ (param == PIN_CONFIG_BIAS_PULL_UP ? BIT(bit) : 0));
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.30.0
|
||||
|
@ -15,3 +15,10 @@ CONFIG_DRM_I915=m
|
||||
CONFIG_DRM_I915_CAPTURE_ERROR=y
|
||||
CONFIG_DRM_I915_COMPRESS_ERROR=y
|
||||
CONFIG_DRM_I915_USERPTR=y
|
||||
|
||||
CONFIG_MMC=y
|
||||
CONFIG_MMC_BLOCK=y
|
||||
CONFIG_MMC_SDHCI=y
|
||||
CONFIG_MMC_SDHCI_ACPI=y
|
||||
CONFIG_MMC_SDHCI_PCI=y
|
||||
CONFIG_X86_INTEL_LPSS=y
|
||||
|
@ -5,7 +5,7 @@
|
||||
</References>
|
||||
<DiskSection>
|
||||
<Info>List of the virtual disks used in the package</Info>
|
||||
<Disk ovf:capacity="6442450944" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:boot="True" vbox:uuid="5f042839-c478-43d9-9eb0-fd8a902146ec"/>
|
||||
<Disk ovf:capacity="34359738368" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:boot="True" vbox:uuid="5f042839-c478-43d9-9eb0-fd8a902146ec"/>
|
||||
</DiskSection>
|
||||
<NetworkSection>
|
||||
<Info>Logical networks used in the package</Info>
|
||||
|
@ -14,9 +14,7 @@ function hassos_pre_image() {
|
||||
# Firmware
|
||||
if [[ "${BOARD_ID}" =~ "rpi4" ]]; then
|
||||
cp "${BINARIES_DIR}/rpi-firmware/fixup.dat" "${BOOT_DATA}/fixup4.dat"
|
||||
cp "${BINARIES_DIR}/rpi-firmware/start.elf" "${BOOT_DATA}/start4.elf"
|
||||
cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.sig" "${BOOT_DATA}/pieeprom.sig"
|
||||
cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.upd" "${BOOT_DATA}/pieeprom.upd"
|
||||
cp "${BINARIES_DIR}/rpi-firmware/start.elf" "${BOOT_DATA}/start4.elf"
|
||||
else
|
||||
cp -t "${BOOT_DATA}" \
|
||||
"${BINARIES_DIR}/rpi-firmware/fixup.dat" \
|
||||
@ -24,6 +22,12 @@ function hassos_pre_image() {
|
||||
"${BINARIES_DIR}/rpi-firmware/bootcode.bin"
|
||||
fi
|
||||
|
||||
# EEPROM update for Raspberry Pi 4/Compute Module 4
|
||||
if grep -Eq "^BR2_PACKAGE_RPI_EEPROM=y$" "${BR2_CONFIG}"; then
|
||||
cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.sig" "${BOOT_DATA}/pieeprom.sig"
|
||||
cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.upd" "${BOOT_DATA}/pieeprom.upd"
|
||||
fi
|
||||
|
||||
# Set cmd options
|
||||
echo "dwc_otg.lpm_enable=0 console=tty1" > "${BOOT_DATA}/cmdline.txt"
|
||||
|
||||
|
@ -1,2 +1,3 @@
|
||||
# CONFIG_AUTOFS4_FS is not set
|
||||
# CONFIG_AUTOFS_FS is not set
|
||||
# CONFIG_PGTABLE_MAPPING is not set
|
||||
|
@ -1,5 +1,5 @@
|
||||
From 3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
Message-Id: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
From: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Date: Mon, 15 Jun 2020 10:40:41 +0200
|
||||
Subject: [PATCH 1/8] dt-bindings: arm: bcm: Convert BCM2835 firmware binding
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 3ad7fb9329eabd1d7f692f612742ca5ac38854a5 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <3ad7fb9329eabd1d7f692f612742ca5ac38854a5.1605346684.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
Message-Id: <3ad7fb9329eabd1d7f692f612742ca5ac38854a5.1609281882.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
From: Maxime Ripard <maxime@cerno.tech>
|
||||
Date: Mon, 15 Jun 2020 10:40:42 +0200
|
||||
Subject: [PATCH 2/8] dt-bindings: clock: Add a binding for the RPi Firmware
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 305aeb868929695699e04e26dd590e64ad3c42dd Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <305aeb868929695699e04e26dd590e64ad3c42dd.1605346684.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
Message-Id: <305aeb868929695699e04e26dd590e64ad3c42dd.1609281882.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
From: Maxime Ripard <maxime@cerno.tech>
|
||||
Date: Fri, 26 Jun 2020 13:54:33 +0200
|
||||
Subject: [PATCH 3/8] dt-bindings: arm: bcm: Add a select to the RPI Firmware
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 33743cfcff296b1011e46168ecab185a00e0f00d Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <33743cfcff296b1011e46168ecab185a00e0f00d.1605346684.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
Message-Id: <33743cfcff296b1011e46168ecab185a00e0f00d.1609281882.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Date: Mon, 29 Jun 2020 18:18:37 +0200
|
||||
Subject: [PATCH 4/8] dt-bindings: reset: Add a binding for the RPi Firmware
|
||||
|
@ -1,7 +1,7 @@
|
||||
From fecb02cc3664de0d1c43ce566ff95c1b68fca51e Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <fecb02cc3664de0d1c43ce566ff95c1b68fca51e.1605346684.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
From a97dba6bf04aa09279a7c5b4aec6e4520e354fbd Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <a97dba6bf04aa09279a7c5b4aec6e4520e354fbd.1609281882.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Date: Mon, 29 Jun 2020 18:18:39 +0200
|
||||
Subject: [PATCH 5/8] ARM: dts: bcm2711: Add firmware usb reset node
|
||||
@ -16,7 +16,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
(cherry picked from commit b03300db06bed1997a1eecc4c26f3a2895c57726)
|
||||
---
|
||||
arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
arch/arm/boot/dts/bcm2711-rpi-400.dts | 5 +++++
|
||||
arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 5 +++++
|
||||
3 files changed, 15 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
|
||||
index 21b20e334b1a..d77d61d41bbc 100644
|
||||
@ -34,6 +36,38 @@ index 21b20e334b1a..d77d61d41bbc 100644
|
||||
};
|
||||
|
||||
&gpio {
|
||||
diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts
|
||||
index afd1ca215518..3a1eb65f7075 100644
|
||||
--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
|
||||
@@ -72,6 +72,11 @@
|
||||
"SD_OC_N";
|
||||
status = "okay";
|
||||
};
|
||||
+
|
||||
+ reset: reset {
|
||||
+ compatible = "raspberrypi,firmware-reset";
|
||||
+ #reset-cells = <1>;
|
||||
+ };
|
||||
};
|
||||
|
||||
&gpio {
|
||||
diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
|
||||
index 3ff0be02cb34..7f0a621a47f5 100644
|
||||
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
|
||||
@@ -84,6 +84,11 @@
|
||||
output-low;
|
||||
};
|
||||
};
|
||||
+
|
||||
+ reset: reset {
|
||||
+ compatible = "raspberrypi,firmware-reset";
|
||||
+ #reset-cells = <1>;
|
||||
+ };
|
||||
};
|
||||
|
||||
&pwm1 {
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
From e0231cd65d8c13be1cebae1e6b5fbef61be6be0d Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <e0231cd65d8c13be1cebae1e6b5fbef61be6be0d.1605346684.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
From c19d86704ffaa9fbe830aaa2a4015259928abf70 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <c19d86704ffaa9fbe830aaa2a4015259928abf70.1609281882.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Date: Mon, 29 Jun 2020 18:18:40 +0200
|
||||
Subject: [PATCH 6/8] ARM: dts: bcm2711: Add reset controller to xHCI node
|
||||
@ -18,7 +18,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
(cherry picked from commit 258f92d2f840b6ea62c0b33f04eb4d9270935bba)
|
||||
---
|
||||
arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
arch/arm/boot/dts/bcm2711-rpi-400.dts | 17 +++++++++++++++++
|
||||
arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 12 ++++++++++++
|
||||
3 files changed, 46 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
|
||||
index d77d61d41bbc..513cae21e64c 100644
|
||||
@ -51,6 +53,71 @@ index d77d61d41bbc..513cae21e64c 100644
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
/* uart0 communicates with the BT module */
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts
|
||||
index 3a1eb65f7075..c122aebd4d5e 100644
|
||||
--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
|
||||
@@ -3,6 +3,8 @@
|
||||
#include "bcm2711.dtsi"
|
||||
#include "bcm2835-rpi.dtsi"
|
||||
|
||||
+#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
|
||||
+
|
||||
/ {
|
||||
compatible = "raspberrypi,400", "brcm,bcm2711";
|
||||
model = "Raspberry Pi 400";
|
||||
@@ -195,6 +197,21 @@
|
||||
};
|
||||
};
|
||||
|
||||
+&pcie0 {
|
||||
+ pci@1,0 {
|
||||
+ #address-cells = <3>;
|
||||
+ #size-cells = <2>;
|
||||
+ ranges;
|
||||
+
|
||||
+ reg = <0 0 0 0 0>;
|
||||
+
|
||||
+ usb@1,0 {
|
||||
+ reg = <0x10000 0 0 0 0>;
|
||||
+ resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
/* uart0 communicates with the BT module */
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
|
||||
index 7f0a621a47f5..5eda5d096bfb 100644
|
||||
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
|
||||
@@ -3,6 +3,8 @@
|
||||
#include "bcm2711.dtsi"
|
||||
#include "bcm2835-rpi.dtsi"
|
||||
|
||||
+#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
|
||||
+
|
||||
/ {
|
||||
compatible = "raspberrypi,4-compute-module", "brcm,bcm2711";
|
||||
model = "Raspberry Pi Compute Module 4";
|
||||
@@ -134,6 +136,16 @@
|
||||
};
|
||||
};
|
||||
|
||||
+&pcie0 {
|
||||
+ pci@1,0 {
|
||||
+ #address-cells = <3>;
|
||||
+ #size-cells = <2>;
|
||||
+ ranges;
|
||||
+
|
||||
+ reg = <0 0 0 0 0>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
/* uart0 communicates with the BT module */
|
||||
&uart0 {
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 5038cc5a33a1534bd0e521674314938224838ce4 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <5038cc5a33a1534bd0e521674314938224838ce4.1605346684.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
From 189ef4e3aabe995021fdfb3ff9bfb3f9ffa5fae4 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <189ef4e3aabe995021fdfb3ff9bfb3f9ffa5fae4.1609281882.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
From: Arnd Bergmann <arnd@arndb.de>
|
||||
Date: Fri, 13 Nov 2020 15:59:32 +0100
|
||||
Subject: [PATCH 7/8] arch: pgtable: define MAX_POSSIBLE_PHYSMEM_BITS where
|
||||
|
@ -1,7 +1,7 @@
|
||||
From c18ca341da823bd2ec5aa04ea5970d3867eaae73 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <c18ca341da823bd2ec5aa04ea5970d3867eaae73.1605346684.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
|
||||
From febaf077f14b86da1edaa01abee2d0bfcf7bdece Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <febaf077f14b86da1edaa01abee2d0bfcf7bdece.1609281882.git.stefan@agner.ch>
|
||||
In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch>
|
||||
From: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
Date: Tue, 2 Jun 2020 21:20:08 +0000
|
||||
Subject: [PATCH 8/8] ARM: dts: bcm283x: add compatible picked up by U-Boot
|
||||
|
@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.80"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.86"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/kernel.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
@ -35,7 +35,6 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
|
||||
@ -48,6 +47,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_I915=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
BR2_PACKAGE_DT_UTILS=y
|
||||
BR2_PACKAGE_GPTFDISK=y
|
||||
|
@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.16"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
@ -37,8 +37,10 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
BR2_PACKAGE_GPTFDISK=y
|
||||
BR2_PACKAGE_GPTFDISK_SGDISK=y
|
||||
@ -101,3 +103,4 @@ BR2_PACKAGE_HARDKERNEL_BOOT=y
|
||||
BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C2=y
|
||||
BR2_PACKAGE_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
|
||||
BR2_PACKAGE_RTL8812AU=y
|
||||
|
@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.16"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
@ -37,8 +37,10 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
BR2_PACKAGE_GPTFDISK=y
|
||||
BR2_PACKAGE_GPTFDISK_SGDISK=y
|
||||
@ -99,3 +101,4 @@ BR2_PACKAGE_APPARMOR=y
|
||||
BR2_PACKAGE_APPARMOR_PROFILES=y
|
||||
BR2_PACKAGE_HARDKERNEL_BOOT=y
|
||||
BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C4=y
|
||||
BR2_PACKAGE_RTL8812AU=y
|
||||
|
@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.16"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
|
||||
@ -37,8 +37,10 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
BR2_PACKAGE_GPTFDISK=y
|
||||
BR2_PACKAGE_GPTFDISK_SGDISK=y
|
||||
@ -101,3 +103,4 @@ BR2_PACKAGE_HARDKERNEL_BOOT=y
|
||||
BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_N2=y
|
||||
BR2_PACKAGE_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
|
||||
BR2_PACKAGE_RTL8812AU=y
|
||||
|
@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.16"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="exynos"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
@ -37,10 +37,11 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
BR2_PACKAGE_GPTFDISK=y
|
||||
BR2_PACKAGE_GPTFDISK_SGDISK=y
|
||||
@ -105,3 +106,4 @@ BR2_PACKAGE_HARDKERNEL_BOOT=y
|
||||
BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_XU4=y
|
||||
BR2_PACKAGE_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
|
||||
BR2_PACKAGE_RTL8812AU=y
|
||||
|
@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.80"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.86"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/kernel.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
@ -36,8 +36,9 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
BR2_PACKAGE_DT_UTILS=y
|
||||
BR2_PACKAGE_GPTFDISK=y
|
||||
|
@ -38,8 +38,9 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
|
||||
BR2_PACKAGE_RPI_FIRMWARE=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
|
@ -38,8 +38,9 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_RPI_FIRMWARE=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
BR2_PACKAGE_GPTFDISK=y
|
||||
|
@ -38,8 +38,9 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_RPI_FIRMWARE=y
|
||||
BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
|
@ -38,8 +38,9 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_RPI_FIRMWARE=y
|
||||
BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
|
@ -29,7 +29,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4"
|
||||
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
|
||||
BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
|
||||
BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
|
||||
@ -38,12 +38,12 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_RPI_FIRMWARE=y
|
||||
BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
|
||||
BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
|
||||
BR2_PACKAGE_RPI_EEPROM=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
BR2_PACKAGE_GPTFDISK=y
|
||||
BR2_PACKAGE_GPTFDISK_SGDISK=y
|
||||
|
@ -29,7 +29,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b"
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b bcm2711-rpi-400 bcm2711-rpi-cm4"
|
||||
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
|
||||
BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
|
||||
BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
|
||||
@ -38,12 +38,12 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_RPI_FIRMWARE=y
|
||||
BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
|
||||
BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
|
||||
BR2_PACKAGE_RPI_EEPROM=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
BR2_PACKAGE_GPTFDISK=y
|
||||
BR2_PACKAGE_GPTFDISK_SGDISK=y
|
||||
|
@ -38,8 +38,9 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_RPI_FIRMWARE=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
BR2_PACKAGE_GPTFDISK=y
|
||||
|
@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.80"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.86"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
@ -39,10 +39,10 @@ BR2_PACKAGE_PROCPS_NG=y
|
||||
BR2_PACKAGE_JQ=y
|
||||
BR2_PACKAGE_E2FSPROGS=y
|
||||
BR2_PACKAGE_E2FSPROGS_E2IMAGE=y
|
||||
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
|
||||
BR2_PACKAGE_SQUASHFS=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
|
||||
BR2_PACKAGE_CRDA=y
|
||||
BR2_PACKAGE_GPTFDISK=y
|
||||
BR2_PACKAGE_GPTFDISK_SGDISK=y
|
||||
|
@ -44,3 +44,6 @@ CONFIG_CIFS_ACL=y
|
||||
CONFIG_CIFS_DFS_UPCALL=y
|
||||
|
||||
CONFIG_WIREGUARD=m
|
||||
|
||||
CONFIG_HID=m
|
||||
CONFIG_HIDRAW=y
|
||||
|
@ -1,7 +1,7 @@
|
||||
VERSION_MAJOR=5
|
||||
VERSION_BUILD=6
|
||||
VERSION_BUILD=10
|
||||
|
||||
HASSOS_NAME="HassOS"
|
||||
HASSOS_NAME="Home Assistant OS"
|
||||
HASSOS_ID="hassos"
|
||||
|
||||
DEPLOYMENT="development"
|
||||
DEPLOYMENT="production"
|
||||
|
10
buildroot-external/package/rtl8812au/Config.in
Normal file
10
buildroot-external/package/rtl8812au/Config.in
Normal file
@ -0,0 +1,10 @@
|
||||
comment "RTL8812AU needs a Linux kernel to be built"
|
||||
depends on !BR2_LINUX_KERNEL
|
||||
|
||||
config BR2_PACKAGE_RTL8812AU
|
||||
bool "Realtek RTL8812AU Wi-Fi driver"
|
||||
depends on BR2_LINUX_KERNEL
|
||||
help
|
||||
Install Realtek RTL8812AU Wi-Fi driver as a kernel module.
|
||||
|
||||
https://github.com/gnab/rtl8812au/
|
19
buildroot-external/package/rtl8812au/rtl8812au.mk
Normal file
19
buildroot-external/package/rtl8812au/rtl8812au.mk
Normal file
@ -0,0 +1,19 @@
|
||||
################################################################################
|
||||
#
|
||||
# Realtek RTL8812AU driver
|
||||
#
|
||||
################################################################################
|
||||
|
||||
RTL8812AU_VERSION = cc4c64deef8090515a3dea8b709bfff0a1007d8b
|
||||
RTL8812AU_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_VERSION))
|
||||
RTL8812AU_LICENSE = GPL-2.0
|
||||
RTL8812AU_LICENSE_FILES = COPYING
|
||||
#RTL8812AU_MODULE_SUBDIRS = src
|
||||
|
||||
RTL8812AU_MODULE_MAKE_OPTS = \
|
||||
CONFIG_88XXAU=m \
|
||||
KVER=$(LINUX_VERSION_PROBED) \
|
||||
KSRC=$(LINUX_DIR)
|
||||
|
||||
$(eval $(kernel-module))
|
||||
$(eval $(generic-package))
|
38
buildroot-external/rootfs-overlay/etc/systemd/logind.conf
Normal file
38
buildroot-external/rootfs-overlay/etc/systemd/logind.conf
Normal file
@ -0,0 +1,38 @@
|
||||
# This file is part of systemd.
|
||||
#
|
||||
# systemd is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation; either version 2.1 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Entries in this file show the compile time defaults.
|
||||
# You can change settings by editing this file.
|
||||
# Defaults can be restored by simply deleting this file.
|
||||
#
|
||||
# See logind.conf(5) for details.
|
||||
|
||||
[Login]
|
||||
#NAutoVTs=6
|
||||
#ReserveVT=6
|
||||
#KillUserProcesses=yes
|
||||
#KillOnlyUsers=
|
||||
#KillExcludeUsers=root
|
||||
#InhibitDelayMaxSec=5
|
||||
#HandlePowerKey=poweroff
|
||||
#HandleSuspendKey=suspend
|
||||
#HandleHibernateKey=hibernate
|
||||
HandleLidSwitch=ignore
|
||||
HandleLidSwitchExternalPower=ignore
|
||||
HandleLidSwitchDocked=ignore
|
||||
#PowerKeyIgnoreInhibited=no
|
||||
#SuspendKeyIgnoreInhibited=no
|
||||
#HibernateKeyIgnoreInhibited=no
|
||||
#LidSwitchIgnoreInhibited=yes
|
||||
#HoldoffTimeoutSec=30s
|
||||
#IdleAction=ignore
|
||||
#IdleActionSec=30min
|
||||
#RuntimeDirectorySize=10%
|
||||
#RuntimeDirectoryInodes=400k
|
||||
#RemoveIPC=yes
|
||||
#InhibitorsMax=8192
|
||||
#SessionsMax=8192
|
@ -16,7 +16,7 @@
|
||||
#FallbackDNS=1.1.1.1 8.8.8.8 1.0.0.1 8.8.4.4 2606:4700:4700::1111 2001:4860:4860::8888 2606:4700:4700::1001 2001:4860:4860::8844
|
||||
#Domains=
|
||||
DNSSEC=no
|
||||
#DNSOverTLS=opportunistic
|
||||
DNSOverTLS=no
|
||||
#MulticastDNS=yes
|
||||
#LLMNR=yes
|
||||
#Cache=yes
|
||||
|
@ -10,6 +10,7 @@ Wants=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2dboot.service
|
||||
What=/dev/disk/by-label/hassos-boot
|
||||
Where=/mnt/boot
|
||||
Type=auto
|
||||
Options=sync
|
||||
|
||||
[Install]
|
||||
WantedBy=local-fs.target
|
||||
|
@ -6,7 +6,7 @@ After=hassos-expand.service
|
||||
Before=umount.target local-fs.target
|
||||
Conflicts=umount.target
|
||||
After=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2ddata.service
|
||||
Wants=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2ddata.service
|
||||
Wants=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2ddata.service systemd-growfs@mnt-data.service
|
||||
|
||||
[Mount]
|
||||
What=/dev/disk/by-label/hassos-data
|
||||
|
@ -0,0 +1,18 @@
|
||||
#
|
||||
# Extracted from fstab-generator
|
||||
#
|
||||
|
||||
[Unit]
|
||||
Description=Grow File System on %f
|
||||
Documentation=man:systemd-growfs@.service(8)
|
||||
DefaultDependencies=no
|
||||
BindsTo=%i.mount
|
||||
Conflicts=shutdown.target
|
||||
After=%i.mount
|
||||
Before=shutdown.target local-fs.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/usr/lib/systemd/systemd-growfs %f
|
||||
TimeoutSec=0
|
@ -13,24 +13,36 @@ PART_NUM="$(cat "/sys/class/block/${DEVICE_CHILD_NAME}/partition")"
|
||||
# Get partition label type
|
||||
PART_TABLE="$(sfdisk -lqJ "${DEVICE_ROOT}")"
|
||||
PART_LABEL="$(echo "${PART_TABLE}" | jq -r '.partitiontable.label')"
|
||||
echo "[INFO] Checking if expanding data partition on ${DEVICE_CHILD} is necessary"
|
||||
|
||||
if [ "${PART_LABEL}" = "gpt" ]; then
|
||||
echo "[INFO] Detected GPT partition label"
|
||||
# We cannot use .partitiontable.lastlba from the json output as we might
|
||||
# still have the backup GPT not at the end of the disk. Calculate last
|
||||
# usable LBA using disk size
|
||||
LAST_USABLE_LBA=$(( $(cat "/sys/class/block/${DEVICE_ROOT_NAME}/size") - 34 ))
|
||||
echo "[INFO] Detected GPT partition label on ${DEVICE_ROOT}"
|
||||
|
||||
if sfdisk --verify "${DEVICE_ROOT}" 2>&1 | grep "The backup GPT table is not on the end of the device."; then
|
||||
echo "[INFO] Moving GPT backup header to the end"
|
||||
sfdisk --relocate gpt-bak-std "${DEVICE_ROOT}"
|
||||
|
||||
# Reload partition label to get correct .partitiontable.lastlba
|
||||
PART_TABLE="$(sfdisk -lqJ "${DEVICE_ROOT}")"
|
||||
fi
|
||||
LAST_USABLE_LBA="$(echo "${PART_TABLE}" | jq -r '.partitiontable.lastlba')"
|
||||
else
|
||||
echo "[INFO] Detected MBR partition label"
|
||||
LAST_USABLE_LBA=$(cat "/sys/class/block/${DEVICE_ROOT_NAME}/size")
|
||||
echo "[INFO] Detected MBR partition label on ${DEVICE_ROOT}"
|
||||
|
||||
# For MBR, we have to calculate the last usable sector by ourselfs
|
||||
DEVICE_SIZE=$(blockdev --getsize64 "${DEVICE_ROOT}")
|
||||
SECTOR_SIZE=$(echo "${PART_TABLE}" | jq -r '.partitiontable.sectorsize')
|
||||
LAST_USABLE_LBA="$((DEVICE_SIZE / SECTOR_SIZE))"
|
||||
fi
|
||||
echo "[INFO] Last usable logical block ${LAST_USABLE_LBA}"
|
||||
|
||||
# Calculate end of data partition
|
||||
JQ_FILTER=".partitiontable.partitions[] | select ( .node == \"${DEVICE_CHILD}\" ) | .start + .size"
|
||||
DATA_PARTITION_END="$(echo "${PART_TABLE}" | jq "${JQ_FILTER}")"
|
||||
echo "[INFO] Data partition end block ${DATA_PARTITION_END}"
|
||||
|
||||
# Need resize? Ignore everything less than 8MB since that could be partition
|
||||
# alignment rounding...
|
||||
# Need resize? Ignore free space if its less than 8MB/64MB (4k sectors) since
|
||||
# that could be partition alignment rounding...
|
||||
UNUSED_BLOCKS=$(( LAST_USABLE_LBA - DATA_PARTITION_END ))
|
||||
if [ "${UNUSED_BLOCKS}" -le "16384" ]; then
|
||||
echo "[INFO] No resize of data partition needed"
|
||||
@ -38,25 +50,20 @@ if [ "${UNUSED_BLOCKS}" -le "16384" ]; then
|
||||
fi
|
||||
|
||||
echo "[INFO] Update hassos-data partition ${PART_NUM}"
|
||||
if [ "${PART_LABEL}" = "gpt" ]; then
|
||||
sgdisk -e "${DEVICE_ROOT}"
|
||||
sgdisk -d "${PART_NUM}" \
|
||||
-n "${PART_NUM}:0:0" \
|
||||
-c "${PART_NUM}:hassos-data" \
|
||||
-t "${PART_NUM}:0FC63DAF-8483-4772-8E79-3D69D8477DE4" \
|
||||
-u "${PART_NUM}:a52a4597-fa3a-4851-aefd-2fbe9f849079" \
|
||||
"${DEVICE_ROOT}"
|
||||
sgdisk -v "${DEVICE_ROOT}"
|
||||
else
|
||||
echo ", +" | sfdisk -N "${PART_NUM}" "${DEVICE_ROOT}" --force
|
||||
sfdisk -V "${DEVICE_ROOT}"
|
||||
echo ", +" | sfdisk --no-reread --no-tell-kernel -N "${PART_NUM}" "${DEVICE_ROOT}"
|
||||
sfdisk -V "${DEVICE_ROOT}"
|
||||
|
||||
# Update the kernel's partition table
|
||||
partx -u "${DEVICE_ROOT}"
|
||||
udevadm settle
|
||||
|
||||
# Make sure /dev/disk/by-label/hassos-data is actually present before exiting.
|
||||
# This avoids a race condition with mnt-data.mount which might fail to bind
|
||||
# otherwise:
|
||||
# Bound to unit dev-disk-by\x2dlabel-hassos\x2ddata.device, but unit isn't active.
|
||||
if ! systemctl start "dev-disk-by\\x2dlabel-hassos\\x2ddata.device"; then
|
||||
echo "[ERROR] Data partition not found!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
partx -u "${DEVICE_ROOT}"
|
||||
|
||||
# Resize filesystem
|
||||
echo "[INFO] Resize hassos-data filesystem"
|
||||
e2fsck -y "${DEVICE_CHILD}"
|
||||
resize2fs -f "${DEVICE_CHILD}"
|
||||
|
||||
echo "[INFO] Finish hassos-data resizing"
|
||||
echo "[INFO] Finished hassos-data partition resizing"
|
||||
|
@ -21,7 +21,7 @@ install_hassos_cli
|
||||
# Write os-release
|
||||
# shellcheck disable=SC2153
|
||||
(
|
||||
echo "NAME=${HASSOS_NAME}"
|
||||
echo "NAME=\"${HASSOS_NAME}\""
|
||||
echo "VERSION=\"$(hassos_version) (${BOARD_NAME})\""
|
||||
echo "ID=${HASSOS_ID}"
|
||||
echo "VERSION_ID=$(hassos_version)"
|
||||
|
@ -0,0 +1,82 @@
|
||||
From a19d20fdbeab82cfe0c972ef6b2a292b582011cb Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <a19d20fdbeab82cfe0c972ef6b2a292b582011cb.1608480376.git.stefan@agner.ch>
|
||||
In-Reply-To: <dd83e231779b8daaeaa0a78d6686b80eeb49c12b.1608480376.git.stefan@agner.ch>
|
||||
References: <dd83e231779b8daaeaa0a78d6686b80eeb49c12b.1608480376.git.stefan@agner.ch>
|
||||
From: Stefan Agner <stefan@agner.ch>
|
||||
Date: Sun, 20 Dec 2020 16:57:09 +0100
|
||||
Subject: [PATCH 8/8] systemd: Bump to latest systemd-stable release 246.9
|
||||
|
||||
---
|
||||
...o-not-fail-with-read-only-etc-or-var.patch | 34 -------------------
|
||||
package/systemd/systemd.hash | 2 +-
|
||||
package/systemd/systemd.mk | 2 +-
|
||||
3 files changed, 2 insertions(+), 36 deletions(-)
|
||||
delete mode 100644 package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
|
||||
|
||||
diff --git a/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch b/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
|
||||
deleted file mode 100644
|
||||
index 01e7f1e906..0000000000
|
||||
--- a/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
|
||||
+++ /dev/null
|
||||
@@ -1,34 +0,0 @@
|
||||
-From e2a23672a1bbf4d3411dce0289051b5a72bd4a67 Mon Sep 17 00:00:00 2001
|
||||
-From: Felix Riemann <felix.riemann@sma.de>
|
||||
-Date: Mon, 19 Oct 2020 18:54:53 +0200
|
||||
-Subject: [PATCH] update-done: Do not fail with read-only /etc or /var
|
||||
-
|
||||
-With the switch from log_debug() to log_debug_errno() in commit c413bb28df
|
||||
-systemd-update-done would fail without any error message if /etc
|
||||
-or /var were read-only. This restores the previous behaviour to
|
||||
-silently ignore these directories again.
|
||||
-
|
||||
-[Romain: backport from 1eee15c3885fcc9f6a40df7e42347cb8fca71280]
|
||||
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
----
|
||||
- src/update-done/update-done.c | 4 ++--
|
||||
- 1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
-
|
||||
-diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
|
||||
-index e9d589e0e5..92c348d83b 100644
|
||||
---- a/src/update-done/update-done.c
|
||||
-+++ b/src/update-done/update-done.c
|
||||
-@@ -31,8 +31,8 @@ static int apply_timestamp(const char *path, struct timespec *ts) {
|
||||
-
|
||||
- r = write_string_file_atomic_label_ts(path, message, ts);
|
||||
- if (r == -EROFS)
|
||||
-- return log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path);
|
||||
-- if (r < 0)
|
||||
-+ log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path);
|
||||
-+ else if (r < 0)
|
||||
- return log_error_errno(r, "Failed to write \"%s\": %m", path);
|
||||
- return 0;
|
||||
- }
|
||||
---
|
||||
-2.25.4
|
||||
-
|
||||
diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash
|
||||
index cad249199c..2b41ee55f9 100644
|
||||
--- a/package/systemd/systemd.hash
|
||||
+++ b/package/systemd/systemd.hash
|
||||
@@ -1,5 +1,5 @@
|
||||
# sha256 locally computed
|
||||
-sha256 f45c5a98d3be7dd05ed7f1e1a0ab00c7ba52602aa2dc42615bf74be61fcbe178 systemd-246.5.tar.gz
|
||||
+sha256 944f264141ee12199124fe09e811173a3cec72f3db195844707260ee56ad9220 systemd-246.9.tar.gz
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1
|
||||
sha256 b142af99a3d950fb465326d6fd5a49d348523dc0d216682880527264d0a011e9 README
|
||||
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
|
||||
index cb12f667d6..1e4171a9e2 100644
|
||||
--- a/package/systemd/systemd.mk
|
||||
+++ b/package/systemd/systemd.mk
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
-SYSTEMD_VERSION = 246.5
|
||||
+SYSTEMD_VERSION = 246.9
|
||||
SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION))
|
||||
SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos)
|
||||
SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,53 @@
|
||||
From 2a63d2fb5dc2a51888737af1d3e868b4b8cf74c8 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <2a63d2fb5dc2a51888737af1d3e868b4b8cf74c8.1608718424.git.stefan@agner.ch>
|
||||
In-Reply-To: <dd83e231779b8daaeaa0a78d6686b80eeb49c12b.1608718424.git.stefan@agner.ch>
|
||||
References: <dd83e231779b8daaeaa0a78d6686b80eeb49c12b.1608718424.git.stefan@agner.ch>
|
||||
From: Stefan Agner <stefan@agner.ch>
|
||||
Date: Wed, 23 Dec 2020 10:53:20 +0100
|
||||
Subject: [PATCH 9/9] package/linux-firmware: add new option for USB TI
|
||||
3410/5052 firmware
|
||||
|
||||
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
||||
---
|
||||
package/linux-firmware/Config.in | 9 +++++++++
|
||||
package/linux-firmware/linux-firmware.mk | 6 ++++++
|
||||
2 files changed, 15 insertions(+)
|
||||
|
||||
diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
|
||||
index dbdfdb52b3..6d5e961527 100644
|
||||
--- a/package/linux-firmware/Config.in
|
||||
+++ b/package/linux-firmware/Config.in
|
||||
@@ -490,4 +490,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QAT_C62X
|
||||
|
||||
endmenu
|
||||
|
||||
+menu "USB to Serial Firmware"
|
||||
+
|
||||
+config BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI
|
||||
+ bool "USB TI 3410/5052 Serial Firmware"
|
||||
+ help
|
||||
+ Firmware files for TI 3410/5052
|
||||
+
|
||||
+endmenu
|
||||
+
|
||||
endif
|
||||
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
|
||||
index f1c84a134d..f00fb2e6ae 100644
|
||||
--- a/package/linux-firmware/linux-firmware.mk
|
||||
+++ b/package/linux-firmware/linux-firmware.mk
|
||||
@@ -620,6 +620,12 @@ LINUX_FIRMWARE_FILES += qat_c62x.bin qat_c62x_mmp.bin
|
||||
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware
|
||||
endif
|
||||
|
||||
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI),y)
|
||||
+LINUX_FIRMWARE_FILES += ti_3410.fw ti_5052.fw
|
||||
+# No license file; the license is in the file WHENCE
|
||||
+# which is installed unconditionally
|
||||
+endif
|
||||
+
|
||||
ifneq ($(LINUX_FIRMWARE_FILES),)
|
||||
define LINUX_FIRMWARE_INSTALL_FILES
|
||||
cd $(@D) && \
|
||||
--
|
||||
2.29.2
|
||||
|
@ -1,3 +1,32 @@
|
||||
2020.11.1, released December 27th, 2020
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
Infrastructure:
|
||||
- cmake: fix host ccache handling for CMake 3.19
|
||||
- meson: Forcibly disable binary stripping for
|
||||
target builds, enable for host builds
|
||||
- golang: Fix HOST / TARGET directories for per-package builds
|
||||
|
||||
Defconfigs: Beaglebone Qt5: Fix ti-sgx related issues
|
||||
|
||||
Updated/fixed packages: apitrace, arm-trusted-firmware,
|
||||
ca-certificates, cryptopp, dhcpcd, dtv-scan-tables,
|
||||
flare-engine, ghostscript, go, haproxy, imagemagick,
|
||||
imx-gpu-viv, jasper, kismet, libcurl, libglib2, libhtp,
|
||||
libopenssl, libressl, libuv, libuvw, lua, mbedtls, mongodb,
|
||||
mutt, ncurses, netsnmp, nodejs, opencv3, openldap, opkg-utils,
|
||||
paho-mqtt-c, python-crc16, python-lxml, python-pyparsing,
|
||||
python-pyqt5, qt5base, rauc, shadowsocks-libev, sqlcipher,
|
||||
suricata, ti-sgx-demos, tinycbor, uclibc-ng-test, unbound,
|
||||
webkitgtk, wpewebkit, wireshark, x11vnc, xen,
|
||||
xserver_xorg-server
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#13316: beaglebone_qt5_defconfig: PowerVR fails to start
|
||||
#13416: dhcpcd start warning message: no such user dhcpcd
|
||||
|
||||
2020.11, released December 2nd, 2020
|
||||
|
||||
Various fixes.
|
||||
|
@ -1960,9 +1960,6 @@ F: package/openjpeg/
|
||||
N: Olivier Singla <olivier.singla@gmail.com>
|
||||
F: package/shellinabox/
|
||||
|
||||
N: Owen Walpole <owen@walpole.dev>
|
||||
F: package/parprouted/
|
||||
|
||||
N: Parnell Springmeyer <parnell@digitalmentat.com>
|
||||
F: package/scrypt/
|
||||
|
||||
@ -2496,9 +2493,6 @@ N: Thomas Claveirole <thomas.claveirole@green-communications.fr>
|
||||
F: package/fcgiwrap/
|
||||
F: package/openlayers/
|
||||
|
||||
N: Thomas Davis <sunsetbrew@sunsetbrew.com>
|
||||
F: package/civetweb/
|
||||
|
||||
N: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
||||
F: docs/manual/
|
||||
F: package/cereal/
|
||||
|
@ -92,9 +92,9 @@ all:
|
||||
.PHONY: all
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2020.11
|
||||
export BR2_VERSION := 2020.11.1
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1606948000
|
||||
BR2_VERSION_EPOCH = 1609079000
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
@ -7,7 +7,7 @@ Description
|
||||
This configuration will build a complete image for the beaglebone and
|
||||
the TI AM335x-EVM, the board type is identified by the on-board
|
||||
EEPROM. The configuration is based on the
|
||||
ti-processor-sdk-02.00.00.00. Device tree blobs for beaglebone
|
||||
ti-processor-sdk-06.01.00.08. Device tree blobs for beaglebone
|
||||
variants and the evm-sk are built too.
|
||||
|
||||
For Qt5 support support use the beaglebone_qt5_defconfig.
|
||||
@ -43,10 +43,20 @@ output/images/
|
||||
To copy the image file to the sdcard use dd:
|
||||
$ dd if=output/images/sdcard.img of=/dev/XXX
|
||||
|
||||
|
||||
Running Qt5 hellowindow opengl demo:
|
||||
===================
|
||||
# export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
|
||||
# export QT_QPA_PLATFORM=eglfs
|
||||
# export QT_QPA_EGLFS_INTEGRATION=none
|
||||
# /usr/lib/qt/examples/opengl/hellowindow/hellowindow
|
||||
|
||||
|
||||
Tested hardware
|
||||
===============
|
||||
am335x-evm (rev. 1.1A)
|
||||
beagleboneblack (rev. A5A)
|
||||
beaglebone (rev. A6)
|
||||
|
||||
2020, Adam Duskett <aduskett@gmail.com>
|
||||
2016, Lothar Felten <lothar.felten@gmail.com>
|
||||
|
@ -0,0 +1,15 @@
|
||||
{
|
||||
"device": "/dev/dri/card0",
|
||||
"hwcursor": false,
|
||||
"pbuffers": true,
|
||||
"outputs": [
|
||||
{
|
||||
"name": "VGA1",
|
||||
"mode": "off"
|
||||
},
|
||||
{
|
||||
"name": "HDMI1",
|
||||
"mode": "1024x768"
|
||||
}
|
||||
]
|
||||
}
|
@ -40,3 +40,9 @@ Where 'sdX' is the device node of the uSD partition.
|
||||
To upgrade u-boot, cancel autoboot and type:
|
||||
|
||||
> run upgradeu
|
||||
|
||||
See Boundary Devices's buildroot-external-boundary project
|
||||
for additional and advanced defconfigs using Qt5, gstreamer,
|
||||
NXP proprietary packages with demo applications:
|
||||
|
||||
https://github.com/boundarydevices/buildroot-external-boundary
|
||||
|
@ -100,6 +100,14 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += MV_DDR_PATH=$(MV_DDR_MARVELL_DIR)
|
||||
ARM_TRUSTED_FIRMWARE_DEPENDENCIES += mv-ddr-marvell
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_SSP_REGULAR),y)
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=default
|
||||
else ifeq ($(BR2_SSP_STRONG),y)
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=strong
|
||||
else ifeq ($(BR2_SSP_ALL),y)
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=all
|
||||
endif
|
||||
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all
|
||||
|
||||
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y)
|
||||
|
@ -20,11 +20,8 @@ BR2_PACKAGE_FBV=y
|
||||
BR2_PACKAGE_QT5=y
|
||||
BR2_PACKAGE_QT5BASE_EXAMPLES=y
|
||||
BR2_PACKAGE_QT5BASE_EGLFS=y
|
||||
BR2_PACKAGE_QT5BASE_DEFAULT_QPA="wayland"
|
||||
BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs"
|
||||
BR2_PACKAGE_QT5QUICKCONTROLS=y
|
||||
BR2_PACKAGE_QT5WAYLAND=y
|
||||
BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=y
|
||||
BR2_PACKAGE_WESTON=y
|
||||
BR2_PACKAGE_TI_SGX_DEMOS=y
|
||||
BR2_PACKAGE_TI_SGX_KM=y
|
||||
BR2_PACKAGE_TI_SGX_UM=y
|
||||
|
@ -9,6 +9,9 @@ BR2_GLOBAL_PATCH_DIR="board/chromebook/elm/patches/"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
|
||||
# Linux headers same as kernel (5.9 series)
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
|
@ -11,7 +11,6 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
|
||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh"
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
|
||||
|
||||
# filesystem
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
|
File diff suppressed because one or more lines are too long
Binary file not shown.
@ -174,13 +174,13 @@ List of Examples
|
||||
|
||||
---------------------------------------------------------------------
|
||||
|
||||
Buildroot 2020.11 manual generated on 2020-12-02 22:29:04 UTC from
|
||||
git revision 9624a001f9
|
||||
Buildroot 2020.11.1 manual generated on 2020-12-27 14:25:17 UTC from
|
||||
git revision 804a9e1865
|
||||
|
||||
The Buildroot manual is written by the Buildroot developers. It is
|
||||
licensed under the GNU General Public License, version 2. Refer to
|
||||
the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id=
|
||||
9624a001f9d4314f8bcc9219df717d4c41fb5373] file in the Buildroot
|
||||
804a9e18656c1584b059129e0b5cebe2a2405fac] file in the Buildroot
|
||||
sources for the full text of this license.
|
||||
|
||||
Copyright © 2004-2020 The Buildroot developers
|
||||
|
@ -125,7 +125,7 @@ endif
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "5.9.11" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "5.9.14" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
default "4.19.152-cip37-rt16" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
|
@ -1,12 +1,12 @@
|
||||
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
|
||||
sha256 5eb20a65a410669928f94b3975872e493fa6d0fe441c6a78b7564affa2a5d260 linux-5.9.11.tar.xz
|
||||
sha256 39fcfb41dcdf71b6b42b88eff3d8cedbe7523830ccae847f3914c0b97e1e6b49 linux-5.9.14.tar.xz
|
||||
sha256 4ab4a3f694b7b4cfbe78871eab34c8039ad33692144c45c669827a594da85534 linux-5.8.18.tar.xz
|
||||
sha256 49da425c1f3c530fd3ff31d85a0461f6b6dc6e459f7faf3eee23e49a98ce64c7 linux-5.4.80.tar.xz
|
||||
sha256 beec970bbb93de8ab839f27930f7ab00c7bd65af0ffa07a50e765affdc2561c6 linux-5.4.83.tar.xz
|
||||
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
|
||||
sha256 9e0bdebf18a12d0c899e5e4042e715e24a70ab0fd986a3f4c67c8ec2710bad97 linux-4.4.246.tar.xz
|
||||
sha256 49e266c7d72d388e8ce6aa486a1018cc0595ae1b9e99934bce5b484fd8dba9f5 linux-4.9.246.tar.xz
|
||||
sha256 cb02465cc8f1972cc14707b25d779c8668d220c39e68a24bb23afd4c58182b9c linux-4.14.209.tar.xz
|
||||
sha256 18345206f9c61e8adafa5204d0ca0b8619f1d9aafd70cbd5cb0fbf1faf521585 linux-4.19.160.tar.xz
|
||||
sha256 e52a49ceb639d871478a143c314648c35e22222c317ecdf49866830fea5c3dfc linux-4.4.248.tar.xz
|
||||
sha256 4687268061c9933c298b30d28e4bf1a30dfbab7c0da4bee194968e4f81ffeccf linux-4.9.248.tar.xz
|
||||
sha256 0e1bc32c4842c3bbee3a15454408f528acd4d3c5e83312b93008d5ee2e9a0c79 linux-4.14.212.tar.xz
|
||||
sha256 3eeec4e5eb8a129be3536357ecb028fae7d82fac933dcfac0b6089ee398fc5fc linux-4.19.163.tar.xz
|
||||
# Locally computed
|
||||
sha256 d2a06f52143deb929b8d513cf9afc9bd065951389a80fa70bc4d63025b5b3fb9 linux-cip-4.19.152-cip37.tar.gz
|
||||
sha256 bc1dacd3d0f526de3e8754a444e8e02a54521527af639ddb907cb35cda775a8c linux-cip-4.19.152-cip37-rt16.tar.gz
|
||||
|
@ -0,0 +1,104 @@
|
||||
From 7f0f1e7e34f997eef697856804dd478b54bb365e Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 22 Dec 2020 10:45:21 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: respect BUILD_TESTING=OFF
|
||||
|
||||
Allow the user to disable unit tests through BUILD_TESTING=OFF:
|
||||
https://cmake.org/cmake/help/latest/command/enable_testing.html
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/apitrace/apitrace/pull/698]
|
||||
---
|
||||
CMakeLists.txt | 6 +++++-
|
||||
gui/CMakeLists.txt | 6 ++++--
|
||||
lib/guids/CMakeLists.txt | 6 ++++--
|
||||
lib/os/CMakeLists.txt | 6 ++++--
|
||||
lib/trace/CMakeLists.txt | 6 ++++--
|
||||
5 files changed, 21 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4a07f069..ee401887 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -41,6 +41,8 @@ option (ENABLE_FRAME_POINTER "Disable frame pointer omission" ON)
|
||||
|
||||
option (ENABLE_ASAN "Enable Address Sanitizer" OFF)
|
||||
|
||||
+option (BUILD_TESTING "Enable unit tests" ON)
|
||||
+
|
||||
option (ENABLE_TESTS "Enable additional tests" OFF)
|
||||
|
||||
if (ANDROID)
|
||||
@@ -433,7 +435,9 @@ endmacro ()
|
||||
# which subdirectory they are declared
|
||||
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||
|
||||
-enable_testing ()
|
||||
+if (BUILD_TESTING)
|
||||
+ enable_testing ()
|
||||
+endif ()
|
||||
if (CMAKE_CROSSCOMPILING)
|
||||
add_custom_target (check)
|
||||
elseif (DEFINED CMAKE_BUILD_TYPE)
|
||||
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
|
||||
index 5baf3552..ad6ee501 100644
|
||||
--- a/gui/CMakeLists.txt
|
||||
+++ b/gui/CMakeLists.txt
|
||||
@@ -13,8 +13,10 @@ add_library (qubjson STATIC
|
||||
qubjson.cpp
|
||||
)
|
||||
|
||||
-add_gtest (qubjson_test qubjson_test.cpp)
|
||||
-target_link_libraries (qubjson_test qubjson)
|
||||
+if (BUILD_TESTING)
|
||||
+ add_gtest (qubjson_test qubjson_test.cpp)
|
||||
+ target_link_libraries (qubjson_test qubjson)
|
||||
+endif ()
|
||||
|
||||
set(qapitrace_SRCS
|
||||
apisurface.cpp
|
||||
diff --git a/lib/guids/CMakeLists.txt b/lib/guids/CMakeLists.txt
|
||||
index ce0f86da..ea28a18f 100644
|
||||
--- a/lib/guids/CMakeLists.txt
|
||||
+++ b/lib/guids/CMakeLists.txt
|
||||
@@ -5,5 +5,7 @@ add_library (guids STATIC
|
||||
guids.hpp
|
||||
)
|
||||
|
||||
-add_gtest (guids_test guids_test.cpp)
|
||||
-target_link_libraries (guids_test guids)
|
||||
+if (BUILD_TESTING)
|
||||
+ add_gtest (guids_test guids_test.cpp)
|
||||
+ target_link_libraries (guids_test guids)
|
||||
+endif ()
|
||||
diff --git a/lib/os/CMakeLists.txt b/lib/os/CMakeLists.txt
|
||||
index 222411e0..b7134b57 100644
|
||||
--- a/lib/os/CMakeLists.txt
|
||||
+++ b/lib/os/CMakeLists.txt
|
||||
@@ -36,5 +36,7 @@ if (APPLE)
|
||||
)
|
||||
endif ()
|
||||
|
||||
-add_gtest (os_thread_test os_thread_test.cpp)
|
||||
-target_link_libraries (os_thread_test os)
|
||||
+if (BUILD_TESTING)
|
||||
+ add_gtest (os_thread_test os_thread_test.cpp)
|
||||
+ target_link_libraries (os_thread_test os)
|
||||
+endif ()
|
||||
diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt
|
||||
index c68bd00f..d95df978 100644
|
||||
--- a/lib/trace/CMakeLists.txt
|
||||
+++ b/lib/trace/CMakeLists.txt
|
||||
@@ -34,5 +34,7 @@ target_link_libraries (common
|
||||
brotli_dec brotli_common
|
||||
)
|
||||
|
||||
-add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
|
||||
-target_link_libraries (trace_parser_flags_test common)
|
||||
+if (BUILD_TESTING)
|
||||
+ add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
|
||||
+ target_link_libraries (trace_parser_flags_test common)
|
||||
+endif ()
|
||||
--
|
||||
2.29.2
|
||||
|
@ -1,6 +1,6 @@
|
||||
# hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc :
|
||||
sha1 47d4584eae85fc905e4994766eb3930a8a84e2e1 ca-certificates_20190110.tar.xz
|
||||
sha256 ee4bf0f4c6398005f5b5ca4e0b87b82837ac5c3b0280a1cb3a63c47555c3a675 ca-certificates_20190110.tar.xz
|
||||
sha1 f17235bc9c3aec538065a655681815c242a6d7d5 ca-certificates_20200601.tar.xz
|
||||
sha256 43766d5a436519503dfd65ab83488ae33ab4d4ca3d0993797b58c92eb9ed4e63 ca-certificates_20200601.tar.xz
|
||||
|
||||
# Locally computed
|
||||
sha256 80fd11117df5543d5cf17bfd951b0ead213f7867d0b09f09c6d5a5eca3ff7422 debian/copyright
|
||||
sha256 e85e1bcad3a915dc7e6f41412bc5bdeba275cadd817896ea0451f2140a93967c debian/copyright
|
||||
|
@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CA_CERTIFICATES_VERSION = 20190110
|
||||
CA_CERTIFICATES_VERSION = 20200601
|
||||
CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz
|
||||
CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20190513T145054Z/pool/main/c/ca-certificates
|
||||
CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20200602T145955Z/pool/main/c/ca-certificates
|
||||
CA_CERTIFICATES_DEPENDENCIES = host-openssl
|
||||
# ca-certificates can be built with either python 2 or python 3
|
||||
# but it must be at least python 2.7
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Hash from: https://www.cryptopp.com/release820.html:
|
||||
sha256 03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058 cryptopp820.zip
|
||||
# Hash from: https://www.cryptopp.com/release830.html:
|
||||
sha512 ad5219a66c5924d330d3646d0ff996dd235006f6812074bc4eb9e8c662a4f000ba20449d377f24b133d19ce682f7b2a3b2eb4c08857ce0f5bb39743d1d425147 cryptopp830.zip
|
||||
|
||||
# Hash for license file:
|
||||
sha256 f29d65ae3f0c8e327284f193524643ffb4d682fcca3e1740a5c6cbab0e720583 License.txt
|
||||
sha256 e668af8c73a38a66a1e8951d14ec24e7582fee5254dd6c3dae488a416d105d5f License.txt
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CRYPTOPP_VERSION = 8.2.0
|
||||
CRYPTOPP_VERSION = 8.3.0
|
||||
CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip
|
||||
CRYPTOPP_SITE = https://cryptopp.com
|
||||
CRYPTOPP_LICENSE = BSL-1.0, BSD-3-Clause (CRYPTOGAMS), Public domain (ChaCha SSE2 and AVX)
|
||||
|
@ -11,6 +11,18 @@ DHCPCD_DEPENDENCIES = host-pkgconf
|
||||
DHCPCD_LICENSE = BSD-2-Clause
|
||||
DHCPCD_LICENSE_FILES = LICENSE
|
||||
|
||||
DHCPCD_CONFIG_OPTS = \
|
||||
--libexecdir=/lib/dhcpcd \
|
||||
--os=linux \
|
||||
--privsepuser=dhcpcd
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
DHCPCD_CONFIG_OPTS += --with-udev
|
||||
DHCPCD_DEPENDENCIES += udev
|
||||
else
|
||||
DHCPCD_CONFIG_OPTS += --without-udev
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
DHCPCD_CONFIG_OPTS += --enable-static
|
||||
endif
|
||||
@ -20,16 +32,11 @@ DHCPCD_CONFIG_OPTS += --disable-fork --disable-privsep
|
||||
endif
|
||||
|
||||
define DHCPCD_CONFIGURE_CMDS
|
||||
(cd $(@D); \
|
||||
$(TARGET_CONFIGURE_OPTS) ./configure \
|
||||
--os=linux \
|
||||
--libexecdir=/lib/dhcpcd \
|
||||
$(DHCPCD_CONFIG_OPTS) )
|
||||
(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(DHCPCD_CONFIG_OPTS))
|
||||
endef
|
||||
|
||||
define DHCPCD_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) \
|
||||
-C $(@D) all
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all
|
||||
endef
|
||||
|
||||
define DHCPCD_INSTALL_TARGET_CMDS
|
||||
@ -51,6 +58,10 @@ define DHCPCD_INSTALL_INIT_SYSTEMD
|
||||
endef
|
||||
endif
|
||||
|
||||
define DHCPCD_USERS
|
||||
dhcpcd -1 dhcpcd -1 * - - - dhcpcd user
|
||||
endef
|
||||
|
||||
# NOTE: Even though this package has a configure script, it is not generated
|
||||
# using the autotools, so we have to use the generic package infrastructure.
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
DTV_SCAN_TABLES_VERSION = 6d019038cd04e837d9dd58701202c15924c1c654
|
||||
DTV_SCAN_TABLES_SITE = http://git.linuxtv.org/cgit.cgi/dtv-scan-tables.git
|
||||
DTV_SCAN_TABLES_SITE = https://git.linuxtv.org/dtv-scan-tables.git
|
||||
DTV_SCAN_TABLES_SITE_METHOD = git
|
||||
|
||||
# This package only contains the transponders data. This is not a 'work'
|
||||
|
@ -2,6 +2,7 @@ config BR2_PACKAGE_FLARE_ENGINE
|
||||
bool "flare-engine"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS # SDL2
|
||||
select BR2_PACKAGE_LIBPNG # SDL2_IMAGE needs libpng support
|
||||
select BR2_PACKAGE_SDL2
|
||||
select BR2_PACKAGE_SDL2_IMAGE
|
||||
select BR2_PACKAGE_SDL2_MIXER
|
||||
|
@ -108,6 +108,7 @@ define IMX_GPU_VIV_INSTALL_TARGET_CMDS
|
||||
$(IMX_GPU_VIV_INSTALL_EXAMPLES)
|
||||
$(IMX_GPU_VIV_INSTALL_GMEM_INFO)
|
||||
cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr
|
||||
$(INSTALL) -D -m 0644 $(@D)/gpu-core/etc/Vivante.icd $(TARGET_DIR)/etc/OpenCL/vendors/Vivante.icd
|
||||
for lib in EGL GAL GLESv2 VDK; do \
|
||||
for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \
|
||||
case $$f in \
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9532/SHA512SUMS
|
||||
sha512 73aa6013aeecbd1345317a40349089a2f19a2205fc11b8ca0b619df1e91f2ca8b03efc09be9e079cb5ab8e1b838aa2236349cd1c177217c14308242f99138ae4 ghostscript-9.53.2.tar.gz
|
||||
# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/SHA512SUMS
|
||||
sha512 c142ef9d83896aa8fd18c8e412220fe8f4950614be00d327d27ab051fe85e16524bf2ee00f46c2aca7a352ce47bc3acf2c4de0f7bbea7e4c55474b8af6cdc0a6 ghostscript-9.53.3.tar.gz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GHOSTSCRIPT_VERSION = 9.53.2
|
||||
GHOSTSCRIPT_VERSION = 9.53.3
|
||||
GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION))
|
||||
GHOSTSCRIPT_LICENSE = AGPL-3.0
|
||||
GHOSTSCRIPT_LICENSE_FILES = LICENSE
|
||||
|
@ -1,3 +1,3 @@
|
||||
# From https://golang.org/dl/
|
||||
sha256 c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1 go1.15.5.src.tar.gz
|
||||
sha256 890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817 go1.15.6.src.tar.gz
|
||||
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GO_VERSION = 1.15.5
|
||||
GO_VERSION = 1.15.6
|
||||
GO_SITE = https://storage.googleapis.com/golang
|
||||
GO_SOURCE = go$(GO_VERSION).src.tar.gz
|
||||
|
||||
@ -39,6 +39,10 @@ else ifeq ($(BR2_ARM_CPU_ARMV6),y)
|
||||
GO_GOARM = 6
|
||||
else ifeq ($(BR2_ARM_CPU_ARMV7A),y)
|
||||
GO_GOARM = 7
|
||||
else ifeq ($(BR2_ARM_CPU_ARMV8A),y)
|
||||
# Go doesn't support 32-bit GOARM=8 (https://github.com/golang/go/issues/29373)
|
||||
# but can still benefit from armv7 optimisations
|
||||
GO_GOARM = 7
|
||||
endif
|
||||
else ifeq ($(BR2_aarch64),y)
|
||||
GO_GOARCH = arm64
|
||||
@ -99,8 +103,8 @@ HOST_GO_HOST_ENV = \
|
||||
$(HOST_GO_COMMON_ENV) \
|
||||
GOARCH="" \
|
||||
GOCACHE="$(HOST_GO_HOST_CACHE)" \
|
||||
CC="$(HOST_CCNOCCACHE)" \
|
||||
CXX="$(HOST_CXXNOCCACHE)" \
|
||||
CC="$(HOSTCC_NOCCACHE)" \
|
||||
CXX="$(HOSTCXX_NOCCACHE)" \
|
||||
CGO_CFLAGS="$(HOST_CFLAGS)" \
|
||||
CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \
|
||||
CGO_LDFLAGS="$(HOST_LDFLAGS)"
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.4.tar.gz.sha256
|
||||
sha256 87a4d9d4ff8dc3094cb61bbed4a8eed2c40b5ac47b9604daebaf036d7b541be2 haproxy-2.2.4.tar.gz
|
||||
# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.6.tar.gz.sha256
|
||||
sha256 be1c6754cbaceafc4837e0c6036c7f81027a3992516435cbbbc5dc749bf5a087 haproxy-2.2.6.tar.gz
|
||||
# Locally computed:
|
||||
sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE
|
||||
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
HAPROXY_VERSION_MAJOR = 2.2
|
||||
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).4
|
||||
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).6
|
||||
HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src
|
||||
HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions
|
||||
HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 9f2b8b131222354b196c640fca4e53eb0bbf62246621b9d467f223366272d7a7 imagemagick-7.0.10-28.tar.gz
|
||||
sha256 e2d364de83dd9e7c866bd99ee7dac2fe92071fb70e9b187293353fb285cf09ac LICENSE
|
||||
sha256 fa993169a06052267eaf81cf85bbf5a30c0bf243511017d986f47abbe65ff262 imagemagick-7.0.10-51.tar.gz
|
||||
sha256 7b43ee798e835f5e0dc03c92c52d288b46a771c4561d57ef2a9a8b2c76bf33cb LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IMAGEMAGICK_VERSION = 7.0.10-28
|
||||
IMAGEMAGICK_VERSION = 7.0.10-51
|
||||
IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION))
|
||||
IMAGEMAGICK_LICENSE = Apache-2.0
|
||||
IMAGEMAGICK_LICENSE_FILES = LICENSE
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 afc4166bff29b8a0dc46ed5e8d6a208d7976fccfd0b1146e3400c8b2948794a2 jasper-2.0.22.tar.gz
|
||||
sha256 20facc904bd9d38c20e0c090b1be3ae02ae5b2703b803013be2ecad586a18927 jasper-2.0.23.tar.gz
|
||||
sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
JASPER_VERSION = 2.0.22
|
||||
JASPER_VERSION = 2.0.23
|
||||
JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION))
|
||||
JASPER_INSTALL_STAGING = YES
|
||||
JASPER_LICENSE = JasPer-2.0
|
||||
|
@ -0,0 +1,44 @@
|
||||
From e70968bcbca86dd448d619c40cdeaae8b7dcee98 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 24 Nov 2020 23:01:55 +0100
|
||||
Subject: [PATCH] configure.ac: don't override LDFLAGS with CPPFLAGS
|
||||
|
||||
Don't override LDFLAGS with CPPFLAGS to avoid a build failure when
|
||||
building statically with uclibc due to -static keyword being lost:
|
||||
|
||||
/home/buildroot/autobuild/run/instance-3/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o kismet_cap_linux_wifi ../interface_control.c.o ../wifi_ht_channels.c.o linux_wireless_control.c.o linux_netlink_control.c.o linux_nexmon_control.c.o linux_wireless_rfkill.c.o capture_linux_wifi.c.o ../libkismetdatasource.a -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lpcap -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/home/buildroot/autobuild/run/instance-3/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/lib/.libs -lnl-genl-3 -lnl-3 -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lpthread -lnl-genl-3 -lnl-3 -lpthread -lpthread -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lprotobuf-c -lm
|
||||
/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/libgcc.a(unwind-dw2-fde-dip.o): in function `_Unwind_Find_registered_FDE':
|
||||
/home/buildroot/autobuild/run/instance-3/output-1/build/host-gcc-final-9.3.0/build/xtensa-buildroot-linux-uclibc/libgcc/../../../libgcc/unwind-dw2-fde.c:1040: undefined reference to `dl_iterate_phdr'
|
||||
collect2: error: ld returned 1 exit status
|
||||
|
||||
To fix this build failure, just drop OCPPFLAGS and OLDFLAGS which are
|
||||
not used anymore
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/b859eb3850c0beb23e18010dc2f07cd0f5c14440
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/kismetwireless/kismet/pull/326 (merged)]
|
||||
---
|
||||
configure.ac | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index aab47fb0..4df37a29 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -619,11 +619,6 @@ else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
-OCPPFLAGS=$CPPFLAGS
|
||||
-CPPFLAGS="$CPPFLAGS"
|
||||
-OLDFLAGS=$LDFLAGS
|
||||
-LDFLAGS="$CPPFLAGS"
|
||||
-
|
||||
# Do we need libm for math functions?
|
||||
AC_MSG_CHECKING([for libm math function in std libs])
|
||||
OCFL="$CFLAGS"
|
||||
--
|
||||
2.29.2
|
||||
|
@ -17,6 +17,8 @@ KISMET_DEPENDENCIES = \
|
||||
zlib
|
||||
KISMET_LICENSE = GPL-2.0+
|
||||
KISMET_LICENSE_FILES = LICENSE
|
||||
# We're patching configure.ac
|
||||
KISMET_AUTORECONF = YES
|
||||
KISMET_CONF_OPTS = --disable-debuglibs
|
||||
|
||||
KISMET_CXXFLAGS = $(TARGET_CXXFLAGS)
|
||||
|
@ -1,46 +0,0 @@
|
||||
From 75d2b1787b3253784a94c66016829acf1f442526 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <75d2b1787b3253784a94c66016829acf1f442526.1603688719.git.baruch@tkos.co.il>
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Mon, 26 Oct 2020 06:56:49 +0200
|
||||
Subject: [PATCH] libssh2: fix build with disabled proxy support
|
||||
|
||||
Build breaks because the http_proxy field is missing:
|
||||
|
||||
vssh/libssh2.c: In function 'ssh_connect':
|
||||
vssh/libssh2.c:3119:10: error: 'struct connectdata' has no member named 'http_proxy'
|
||||
if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) {
|
||||
^
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://github.com/curl/curl/pull/6125
|
||||
|
||||
lib/vssh/libssh2.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
|
||||
index 6c6db049bf5a..74cd5d887549 100644
|
||||
--- a/lib/vssh/libssh2.c
|
||||
+++ b/lib/vssh/libssh2.c
|
||||
@@ -3094,6 +3094,7 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done)
|
||||
return CURLE_FAILED_INIT;
|
||||
}
|
||||
|
||||
+#ifndef CURL_DISABLE_PROXY
|
||||
if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) {
|
||||
/*
|
||||
* This crazy union dance is here to avoid assigning a void pointer a
|
||||
@@ -3132,7 +3133,9 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done)
|
||||
libssh2_session_callback_set(ssh->ssh_session,
|
||||
LIBSSH2_CALLBACK_SEND, sshsend.sendp);
|
||||
}
|
||||
- else if(conn->handler->protocol & CURLPROTO_SCP) {
|
||||
+ else
|
||||
+#endif /* CURL_DISABLE_PROXY */
|
||||
+ if(conn->handler->protocol & CURLPROTO_SCP) {
|
||||
conn->recv[FIRSTSOCKET] = scp_recv;
|
||||
conn->send[FIRSTSOCKET] = scp_send;
|
||||
}
|
||||
--
|
||||
2.28.0
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://curl.haxx.se/download/curl-7.73.0.tar.xz.asc
|
||||
# https://curl.haxx.se/download/curl-7.74.0.tar.xz.asc
|
||||
# signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
|
||||
sha256 7c4c7ca4ea88abe00fea4740dcf81075c031b1d0bb23aff2d5efde20a3c2408a curl-7.73.0.tar.xz
|
||||
sha256 999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b curl-7.74.0.tar.xz
|
||||
sha256 db3c4a3b3695a0f317a0c5176acd2f656d18abc45b3ee78e50935a78eb1e132e COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCURL_VERSION = 7.73.0
|
||||
LIBCURL_VERSION = 7.74.0
|
||||
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
|
||||
LIBCURL_SITE = https://curl.haxx.se/download
|
||||
LIBCURL_DEPENDENCIES = host-pkgconf \
|
||||
|
@ -5,7 +5,7 @@ Subject: [PATCH] Fix compile time atomic detection
|
||||
|
||||
Improved compile-time detection of atomic support in the compiler.
|
||||
|
||||
Upstream-Status: Merged
|
||||
Upstream-Status: 'Needs information'
|
||||
See : https://gitlab.gnome.org/GNOME/glib/issues/1063
|
||||
|
||||
Signed-off-by: Brendan Heading <brendanheading@gmail.com>
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 4c3ac4c6027710455ffe725f24ac6a83b2c13fe0afc83b74df2cca78ba46976a libhtp-0.5.35.tar.gz
|
||||
sha256 ab1dd6cfd4ab4c36624a5c74793d80d1b7f50f5791620f47bfd831a79e32bc4b libhtp-0.5.36.tar.gz
|
||||
sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBHTP_VERSION = 0.5.35
|
||||
LIBHTP_VERSION = 0.5.36
|
||||
LIBHTP_SITE = $(call github,OISF,libhtp,$(LIBHTP_VERSION))
|
||||
LIBHTP_LICENSE = BSD-3-Clause
|
||||
LIBHTP_LICENSE_FILES = LICENSE
|
||||
|
@ -9,6 +9,8 @@ Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com>
|
||||
|
||||
[rebased on openssl-1.1.0h]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
[rebased on openssl-1.1.1i]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
Configurations/unix-Makefile.tmpl | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
@ -17,7 +19,7 @@ diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tm
|
||||
index 40cf2c3..777d9ca 100644
|
||||
--- a/Configurations/unix-Makefile.tmpl
|
||||
+++ b/Configurations/unix-Makefile.tmpl
|
||||
@@ -268,7 +268,7 @@ list-tests:
|
||||
@@ -491,7 +491,7 @@ list-tests:
|
||||
@echo "Tests are not supported with your chosen Configure options"
|
||||
@ : {- output_on() if !$disabled{tests}; "" -}
|
||||
|
||||
|
@ -11,6 +11,8 @@ Reviewed-by: Richard Levitte <levitte@openssl.org>
|
||||
(Merged from https://github.com/openssl/openssl/pull/8883)
|
||||
[vfazio: fixup for 1.1.1d]
|
||||
Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
|
||||
[rebased on openssl-1.1.1i]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
Configure | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
@ -19,7 +21,7 @@ diff --git a/Configure b/Configure
|
||||
index 5a699836f3..f9152b1702 100755
|
||||
--- a/Configure
|
||||
+++ b/Configure
|
||||
@@ -1413,6 +1413,10 @@ my %predefined_CXX = $config{CXX}
|
||||
@@ -1417,6 +1417,10 @@ my %predefined_CXX = $config{CXX}
|
||||
? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
|
||||
: ();
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://www.openssl.org/source/openssl-1.1.1h.tar.gz.sha256
|
||||
sha256 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 openssl-1.1.1h.tar.gz
|
||||
# From https://www.openssl.org/source/openssl-1.1.1i.tar.gz.sha256
|
||||
sha256 e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242 openssl-1.1.1i.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBOPENSSL_VERSION = 1.1.1h
|
||||
LIBOPENSSL_VERSION = 1.1.1i
|
||||
LIBOPENSSL_SITE = https://www.openssl.org/source
|
||||
LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz
|
||||
LIBOPENSSL_LICENSE = OpenSSL or SSLeay
|
||||
|
@ -1,4 +1,4 @@
|
||||
# From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256
|
||||
sha256 a9d1e1d030b8bcc67bf6428b8c0fff14a5602e2236257b9e3d77acaf12e2a7a1 libressl-3.2.2.tar.gz
|
||||
sha256 412dc2baa739228c7779e93eb07cd645d5c964d2f2d837a9fd56db7498463d73 libressl-3.2.3.tar.gz
|
||||
# Locally computed
|
||||
sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBRESSL_VERSION = 3.2.2
|
||||
LIBRESSL_VERSION = 3.2.3
|
||||
LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
|
||||
LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code)
|
||||
LIBRESSL_LICENSE_FILES = COPYING
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 2cd9a757fe6c512440933e2bdcab21143d4aa6249b2541399908ce038b756c9d libuv-1.38.0.tar.gz
|
||||
sha256 70fe1c9ba4f2c509e8166c0ca2351000237da573bb6c82092339207a9715ba6b libuv-1.40.0.tar.gz
|
||||
sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
# When bumping libuv, check if a new version of uvw is available
|
||||
# and bump it too.
|
||||
LIBUV_VERSION = 1.38.0
|
||||
LIBUV_VERSION = 1.40.0
|
||||
LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION))
|
||||
LIBUV_DEPENDENCIES = host-pkgconf
|
||||
LIBUV_INSTALL_STAGING = YES
|
||||
|
@ -491,4 +491,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QAT_C62X
|
||||
|
||||
endmenu
|
||||
|
||||
menu "USB to Serial Firmware"
|
||||
|
||||
config BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI
|
||||
bool "USB TI 3410/5052 Serial Firmware"
|
||||
help
|
||||
Firmware files for TI 3410/5052
|
||||
|
||||
endmenu
|
||||
|
||||
endif
|
||||
|
@ -620,6 +620,12 @@ LINUX_FIRMWARE_FILES += qat_c62x.bin qat_c62x_mmp.bin
|
||||
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI),y)
|
||||
LINUX_FIRMWARE_FILES += ti_3410.fw ti_5052.fw
|
||||
# No license file; the license is in the file WHENCE
|
||||
# which is installed unconditionally
|
||||
endif
|
||||
|
||||
ifneq ($(LINUX_FIRMWARE_FILES),)
|
||||
define LINUX_FIRMWARE_INSTALL_FILES
|
||||
cd $(@D) && \
|
||||
|
@ -346,13 +346,13 @@ endchoice
|
||||
|
||||
config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "4.4.246" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.246" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.14.209" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.19.160" if BR2_KERNEL_HEADERS_4_19
|
||||
default "5.4.80" if BR2_KERNEL_HEADERS_5_4
|
||||
default "4.4.248" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.248" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.14.212" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.19.163" if BR2_KERNEL_HEADERS_4_19
|
||||
default "5.4.83" if BR2_KERNEL_HEADERS_5_4
|
||||
default "5.8.18" if BR2_KERNEL_HEADERS_5_8
|
||||
default "5.9.11" if BR2_KERNEL_HEADERS_5_9
|
||||
default "5.9.14" if BR2_KERNEL_HEADERS_5_9
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
|
||||
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user