Commit Graph

984 Commits

Author SHA1 Message Date
John Audia
311c9a7ae3
kernel: bump 5.10 to 5.10.87
All patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B, ipq806x/R7800*
Run-tested: bcm2711/RPi4B, ipq806x/R7800*

*Had to revert 7f1edbd412 in order to build
(binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit eabb4a5c5d)
2022-05-29 18:18:01 +08:00
John Audia
195cf9ed77
kernel: bump 5.10 to 5.10.86
All patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B, ipq806x/R7800*
Run-tested: bcm2711/RPi4B, ipq806x/R7800*

*Had to revert 7f1edbd412 in order to build
(binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit 002424e5ae)
2022-05-29 18:17:53 +08:00
John Audia
381b443172
kernel: bump 5.10 to 5.10.85
Removed target for patch which does not exist:
    bcm27xx/patches-5.10/950-0249-kbuild-Disable-gcc-plugins.patch

All patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B, ipq806x/R7800*
Run-tested: bcm2711/RPi4B, ipq806x/R7800*

* Had to revert 7f1edbd412 in order to build
  (binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit 43c0a12665)
2022-05-29 18:17:46 +08:00
John Audia
dae70b26f3
kernel: bump 5.10 to 5.10.84
All patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit 187c8f9153)
2022-05-29 18:17:29 +08:00
John Audia
248b87f617
kernel: bump 5.4 to 5.4.167
All patches automatically rebased.

Build system: x86_64
Build-tested: ramips/mt7621*

*FS#4149 affects me so I had to revert 7f1edbd412
in order to downgrade to 2.35.1

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit d4b25007ea)
2022-05-29 18:16:37 +08:00
John Audia
5a014392da
kernel: bump 5.4 to 5.4.166
All patches automatically rebased.

Build system: x86_64
Build-tested: ramips/mt7621*

*FS#4149 affects me so I had to revert 7f1edbd412
in order to downgrade to 2.35.1

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit 61c76f836f)
2022-05-29 18:16:18 +08:00
John Audia
ea617eaed9
kernel: bump 5.4 to 5.4.165
All patches automatically rebased.

Build system: x86_64
Build-tested: ramips/mt7621*

*FS#4149 affects me so I had to revert 7f1edbd412
in order to downgrade to 2.35.1

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit a696e325f7)
2022-05-29 18:15:06 +08:00
John Audia
5e839f0b8f
kernel: bump 5.10 to 5.10.83
Removed upstreamed:
    bcm53xx/patches-5.10/033-v5.16-0024-ARM-dts-BCM5301X-Fix-I2C-controller-interrupt.patch[1]
    bcm53xx/patches-5.10/033-v5.16-0025-ARM-dts-BCM5301X-Add-interrupt-properties-to-GPIO-no.patch[2]

All other patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=b2cd6fdcbe0a5cb44e4610a08cc58261d494a885
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=9db1d4a3c2700e1cc84c3d61199411d75c2a3ec6

Build system: x86_64*
Build-tested: bcm2711/RPi4B, ipq806x/R7800†
Run-tested: bcm2711/RPi4B, ipq806x/R7800†

* Had to revert 7c99085bd6 in order to build
  (latest bump of ca-certificates)

† Had to revert 7f1edbd412 in order to build
  (binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit 6c945fa379)
2022-05-29 18:14:31 +08:00
Tianling Shen
985cb6840e
Merge Mainline
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-05-29 17:53:15 +08:00
Tianling Shen
cf3914cafe
kernel: bump to 4.9.316, 4.14.281, 4.19.245
Refreshed all patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-05-27 23:40:09 +08:00
Felix Fietkau
c80c82d0a8
include/cmake.mk: add support for overriding the host install prefix
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit a6a9f9be27)
2022-05-21 16:55:40 +08:00
Tianling Shen
991fab8bd1
Merge Mainline
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-05-17 17:06:47 +08:00
Piotr Dymacz
c1a0582615 image: drop unused 'BuildKernel/MkFIT'
The 'MkFIT' recipe is no longer used across whole codebase.

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
2022-05-17 00:13:08 +08:00
Sungbo Eo
e333999ecf
build: image: improve zip build recipe
* clean before build
* specify executable path
* allow adding extra options for zip
* use basename of $@

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
(cherry picked from commit 446da70669)
2022-05-16 14:51:16 +08:00
Sungbo Eo
5b5a34737c
build: image: use UTC for zip timestamp
Zip uses DOS timestamp for mtime which is stored in local time and hence
depends on the timezone of the build system. Force zip to use UTC timezone
to make image builds more reproducible.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
(cherry picked from commit e42764cc5f)
2022-05-16 14:48:22 +08:00
Sungbo Eo
51c26f0c97
tools: zip: fetch SOURCE_DATE_EPOCH directly
Remove "--mtime" option introduced in commit 18c9faa032 ("tools: zip:
add option for reproducible archives") and instead fetch SOURCE_DATE_EPOCH
environment variable directly in the code.

Ref: https://sourceforge.net/p/infozip/patches/25/
Signed-off-by: Sungbo Eo <mans0n@gorani.run>
(cherry picked from commit 39d06472eb)
2022-05-16 14:47:06 +08:00
Tianling Shen
4915d34e9e
kernel: bump to 4.9.313, 4.14.278, 4.19.242
Removed patches:
- bcm27xx/patches-4.19/950-0475-usb-xhci-Disable-the-XHCI-5-second-timeout.patch
    Should be fixed by upstream commit 1c713660c51f3bc64fc1c709ba2bfb358551f3da
      ("xhci: make xhci_handshake timeout for xhci_reset() adjustable").

Refreshed all patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-05-13 18:03:49 +08:00
Daniel Golle
d39b9d9700 trusted-firmware-a.mk: make sure include directory exists
ARM Trusted Firmware builds do not depend on any target libraries as
they are bare-metal builds. However, the compiler aborts due to
-Werror=missing-include-dirs if the include dir doesn't exists and this
can happen when building with parallelisation as that makes it likely
for arm-trusted-firmware-* to be build very early before any of the
libraries which would implicitely create the directory.
Fix this by making sure the include dir exists before building.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2022-05-10 14:29:17 +08:00
Tianling Shen
44e169804e
Merge Mainline
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-04-25 08:01:43 +08:00
Tianling Shen
3ab4809413
Merge Mainline
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-04-14 10:34:23 +08:00
Rosen Penev
fc6078c462
tools/meson: update to 0.61.4
Override python to use the one in host instead of hostpkg. There's no
need to use the latter.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 19f3fcc884)
2022-04-14 01:02:29 +08:00
Tianling Shen
ae29c123c9
kernel: bump to 4.9.309, 4.14.275, 4.19.237
Refreshed all patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-04-11 03:36:16 +08:00
AmadeusGhost
233d89378a Merge Mainline 2022-04-08 11:35:35 +08:00
Christian Lamparter
e13ac7766e image: define DEVICE_DTS_DELIMITER as per-device variable
DEVICE_DTS_DELIMITER needs to be in the DEFAULT_DEVICE_VARS
list to work as expected. This was missing from the original
version and got overlooked.

Fixes: fd67908647 ("scripts: mkits.sh: Allow legacy @ mode for dts creation")
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
2022-04-07 11:36:32 +08:00
Huangbin Zhan
7b78ffa416 build: autotools: fix cache path
the cache directory should be autom4te.cache in all $(PKG_AUTOMAKE_PATHS)
rather than $(PKG_BUILD_DIR)/autom4te.cache only

Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
2022-04-04 17:15:30 +08:00
AmadeusGhost
398ea52770 [HOT FIX] Merge Mainline 2022-04-03 00:50:22 +08:00
Rosen Penev
2f881a392d
gettext: remove package
This package was necessary when uClibc was in the tree. Now that uClibc
is gone, this can go too.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit e6f569406f)
2022-04-02 23:20:45 +08:00
Kevin Darbyshire-Bryant
1dd0699dc0 treewide: convert sed -r to posix -E
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2022-04-02 00:32:51 +08:00
Robert Marko
94055951fc build: image: add command to ubinize the kernel image
Newer NAND devices from MikroTik like the hAP ac3
require the kernel to be packed into UBIFS and then
ubinized.

So, since the ubinize-image.sh script can now ubinize
kernel only as well lets add a command for it.

This now allows calling ubinize-kernel in the kernel
packaging at then end.

Signed-off-by: Robert Marko <robimarko@gmail.com>
2022-04-01 10:57:50 +08:00
Robert Marko
ddba25b57c build: image: explicitly pass --rootfs to append-ubi
Rootfs is now optional in ubinize-image.sh and
requires --rootfs flag instead of just passing the
rootfs image as the argument before ubinize opts.

So, simply add --rootfs flag before the $(IMAGE_ROOTFS).

Signed-off-by: Robert Marko <robimarko@gmail.com>
2022-04-01 10:56:17 +08:00
Robert Marko
2a77d3c640 build: image: add UBIFS kernel packer
This allows packing the kernel into UBIFS like newer
MikroTik NAND devices require.

Signed-off-by: Robert Marko <robimarko@gmail.com>
2022-04-01 10:55:23 +08:00
Tianling Shen
68c389e285
kernel: bump to 4.9.308, 4.14.273, 4.19.236
Refreshed all patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-03-28 00:33:12 +08:00
Tianling Shen
f99dff1f6a
Merge Mainline
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-03-26 22:51:06 +08:00
Eneas U de Queiroz
6b35894112 openssl: move engine.mk to INCLUDE_DIR
engine.mk is supposed to be included by engine packages, but it will not
be present in the SDK in the same place as in the main repository.

Move it to include/openssl-engine.mk to avoid this.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
2022-03-25 10:35:20 +08:00
Rosen Penev
771deecb70
quilt.mk: fix typo in the Host section
HOST_PATCH_DIR is used for host patches, not PATCH_DIR.

Fixes refreshing patches with a custom HOST_PATCH_DIR.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 9586a270a0)
2022-03-21 23:28:09 +08:00
Tianling Shen
30bcdfd2b9
kernel: bump to 4.9.307, 4.14.272, 4.19.235
Added new Kconfig `HARDEN_BRANCH_HISTORY`.

Manually-rebased patches:
- generic/hack-4.9/204-module_strip.patch
- generic/hack-4.9/220-gc_sections.patch
- generic/hack-4.14/220-gc_sections.patch
- generic/hack-4.19/220-gc_sections.patch
- generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch

Refreshed all patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-03-19 19:13:28 +08:00
Tianling Shen
84ebd96334
[HOT FIX] Merge Mainline
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-03-08 12:01:53 +08:00
Rosen Penev
d96722b2e0
include/meson: fix host build directory
When using a non default MESON_HOST_BUILD_DIR, HOST_BUILD_DIR is not
appropriate to use. This change matches the target configure section.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 4c42e2d9dd)
2022-03-08 11:57:49 +08:00
Tianling Shen
ec7b7129f4
Merge Mainline
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-03-03 10:37:24 +08:00
Rosen Penev
e6bb10ac92 tools/meson: update to 0.60.1
change meson binary to use py extension. Fixes issue with meson's
symbolextractor using the host python instead of the system one.

We intentionally use a .py extension here so that meson launches
additional python scripts with the same build host python interpreter as
itself is running under (and not the host package one once it becomes
available)

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2022-02-28 16:08:46 +08:00
Tianling Shen
c96b15cc4d
Merge Mainline
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-02-25 13:03:01 +08:00
Tianling Shen
3ade45c5fa
kernel: bump to 4.9.303, 4.14.268, 4.19.231
Added new Kconfig.

Manually rebased:
- generic/backport-4.19/716-v5.4-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch

Refreshed all patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-02-25 05:03:08 +08:00
Petr Štetiar
f63af09f5b build: toplevel.mk: fix missing kconfig dependency tracking
Toplevel Make is not aware about changes in the `scripts/config/*conf`
targets and this is causing issues for during update to that part of
build tree, where one needs to handle this manually by either force
rebuilding the targets or running `make config-clean`. Fix this by
forcing the rebuild if necessary.

Fixes: #9297
Signed-off-by: Petr Štetiar <ynezz@true.cz>
2022-02-24 11:37:07 +08:00
Etienne Champetier
31e6a03378 netfilter.mk: add conntrack support to nft bridge
This allows to implement statefull bridge filtering

As the uncompressed size is only 7.6k (arm64), just add
nf_conntrack_bridge.ko to kmod-nft-bridge package

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2022-01-29 19:00:21 +08:00
Tianling Shen
3d6248d855
kernel: bump to 4.9.297, 4.14.262, 4.19.225
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-01-25 19:40:05 +08:00
Daniel Golle
6201d92c02
image: use portable filename in 'append-image-stage'
The 'append-image-stage' command doesn't work when setting the
EXTRA_IMAGE_NAME option of the ImageBuilder as in that case
DEVICE_IMG_PREFIX is modified and no longer matches the value it had in
buildroot. Choose a filename independent of DEVICE_IMG_PREFIX for
images staged using 'append-image-stage' to fix that.

Fixes: de4b29dab9 ("image: introduce 'append-image-stage' build command")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit c7a5a093ef)
2022-01-07 14:16:47 +08:00
Daniel Golle
9674d0a66f
image: introduce 'append-image-stage' build command
Similar to 'append-image' this new command appends an existing binary.
'append-image-stage' also makes a copy of that binary and keeps it in
$(STAGING_DIR_IMAGE). When called from within the ImageBuilder, this
copy is used instead of expecting the binary to be present.
This is useful for artifacts which include the initramfs/recovery image
which is usually not included in the ImageBuilder.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit de4b29dab9)
2022-01-07 14:16:23 +08:00
Daniel Golle
db3656aa70
image: fix append-image when building multiple profiles
In case CONFIG_TARGET_MULTI_PROFILE is set, IMG_PREFIX cannot be
expanded. Use DEVICE_IMG_PREFIX instead and make sure it's defined.

Fixes: 8f89b1ab0f ("image: add 'append-image' build command")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit b6c366efa8)
2022-01-07 14:15:31 +08:00
Daniel Golle
4726c988e5
image: add 'append-image' build command
Commit 7ce1d9ce09 ("build: artifacts add dependency for built images")
now makes sure that sysupgrade and initramfs images are available at
the stage that artifacts are created.
Allow making use of that with a new build command 'append-image' to
be used in artifacts.
See the next commit for an example.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 8f89b1ab0f)
2022-01-07 14:14:16 +08:00
INAGAKI Hiroshi
3e1974b707
build: add elecom-product-header for ELECOM devices
A header used in ELECOM WRC-300GHBK2-I and WRC-1750GHBK2-I/C is also
used in ELECOM WRC-2533GHBK-I, so split the code to generate the header
and move it to image-commands.mk to use from ramips target.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Reviewed-by: Sungbo Eo <mans0n@gorani.run>
(cherry picked from commit 0071c7cd82)
2022-01-04 14:19:37 +08:00