Commit Graph

966 Commits

Author SHA1 Message Date
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
Tianling Shen
e9cabadf7c Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-01-03 13:54:53 +08:00
Tianling Shen
beae30302b include/version: Update ImmortalWrt info
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-01-03 13:40:06 +08:00
Tianling Shen
9ac376921e kernel: bump to 4.9.294, 4.14.259, 4.19.222
Resolve conflicted:
 - mvebu/513-arm64-dts-marvell-armada37xx-Add-emmc-sdio-pinctrl-d.patch

Remove upsteamed:
 - mvebu/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch
 - mvebu/527-PCI-aardvark-allow-to-specify-link-capability.patch

Refreshed all patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-12-25 03:54:06 +08:00
Stijn Tintel
d8f481e5ec build: add e5500 CPU_TYPE
This CPU type is compatible with NXP's PPC based QorIQ processors, and
will be used by the upcoming new qoriq target.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Reviewed-by: Rui Salvaterra <rsalvaterra@gmail.com>
2021-12-24 11:26:30 +08:00
John Audia
80893208a4 kernel: bump 5.4 to 5.4.162
All patches automatically rebased.

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

*I am hit with the binutils 2.37 bug so I had to revert 7f1edbd412
in order to downgrade to 2.35.1

Signed-off-by: John Audia <graysky@archlinux.us>
2021-12-20 11:16:52 +08:00
John Audia
87e5fa00d3 kernel: bump 5.4 to 5.4.161
Removed upstreamed:
    ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch[1]

Manually rebased:
    layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
    octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch

All other patches automatically rebased.

1. Private email exchange with patch author, Hauke Mehrtens

Signed-off-by: John Audia <graysky@archlinux.us>
2021-12-20 11:16:27 +08:00
John Audia
aa5aa86599 kernel: bump 5.10 to 5.10.82
Removed upstreamed:
    bcm53xx/patches-5.10/033-v5.16-0014-ARM-dts-NSP-Fix-mpcore-mmc-node-names.patch

Manually rebased:
    ipq806x/patches-5.10/086-ipq8064-fix-duplicate-node.patch

All other patches automatically rebased.

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

Signed-off-by: John Audia <graysky@archlinux.us>
2021-12-20 11:16:13 +08:00
John Audia
a5bfc7d67a kernel: bump 5.10 to 5.10.81
Manually rebased:
    octeontx/patches-5.10/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch

All other patches automatically rebased.

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

Signed-off-by: John Audia <graysky@archlinux.us>
2021-12-20 11:15:59 +08:00
John Audia
4e5a0a3705 kernel: bump 5.4 to 5.4.159
Manually rebased:
    generic-backport/850-v5.13-usb-ehci-add-spurious-flag-to-disable-overcurrent-ch.patch

All other patches automatically rebased.

Signed-off-by: John Audia <graysky@archlinux.us>
2021-12-20 11:15:46 +08:00
Oldřich Jedlička
1fbc7acc6d x86: added support to generate VHDX images
Added support to generate dynamic-sized VHDX images for Hyper-V.
Compile-tested on x86 and run-tested on Windows 10 21H2 (Hyper-V).

Signed-off-by: Oldřich Jedlička <oldium.pro@gmail.com>
2021-12-17 10:58:46 +08:00
Sungbo Eo
32f719e810 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>
2021-12-15 23:58:27 +08:00
Daniel Golle
b68db06a99 image: fix CONFIG_EXTERNAL_CPIO handling
CONFIG_EXTERNAL_CPIO is a string variable, hence testing for 'y'
doesn't make much sense here.

Fixes: 330bd380e8 ("image: allow building FIT and uImage with ramdisk")
Reported-by: Huangbin Zhan <zhanhb88@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-12-15 23:55:27 +08:00
Damien Mascord
a934057148 build: fix ldconfig executable error in python
The empty executable is causing problems with meson builds, due to the
error: OSError: [Errno 8] Exec format error: 'ldconfig'

This patch changes the empty ldconfig stub to symlink to /bin/true to
work around this issue.

Fixes: FS#4117
Fixes: 3bd31cc4d2 ("tools/meson: update to 0.60.0")

Signed-off-by: Damien Mascord <tusker@tusker.org>
Tested-by: Aleksander Jan Bajkowski <olek2@wp.pl> # Tested on Debian 11
Tested-By: Lucian Cristian <lucian.cristian@gmail.com>
Tested-By: Baptiste Jonglez <git@bitsofnetworks.org>
Cc: Rosen Penev <rosenp@gmail.com>
2021-12-09 23:53:05 +08:00
Rosen Penev
bb151a91ce tools/meson: update to 0.60.0
Add cmake support to meson. Otherwise only pkgconfig can be used.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-12-09 23:50:18 +08:00
Rui Salvaterra
0811975706 kernel: bump 5.10 to 5.10.80
Deleted (upstreamed):
ath79/patches-5.10/921-serial-core-add-support-for-boot-console-with-arbitr.patch [1]
bcm53xx/patches-5.10/033-v5.15-0012-ARM-dts-BCM5301X-Fix-memory-nodes-names.patch [2]
lantiq/patches-5.10/0016-mtd-rawnand-xway-Keep-the-driver-compatible-with-on-.patch [3]
lantiq/patches-5.10/0110-MIPS-lantiq-dma-add-small-delay-after-reset.patch [4]
lantiq/patches-5.10/0111-MIPS-lantiq-dma-reset-correct-number-of-channel.patch [5]
lantiq/patches-5.10/0112-MIPS-lantiq-dma-fix-burst-length-for-DEU.patch [6]

Manually rebased:
ipq806x/patches-5.10/0065-arm-override-compiler-flags.patch

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=47462c5e600fbaffd755cd13dedd80d04e41ff83
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=2fde76df1885a6bec04317e457121326070450eb
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=9b366f5221d8aa64b22f35be137a5749326444ce
[4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=5af57ce8a6155fe3e4270d28d171abf8903bebc0
[5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=b92a5df2c7adc79a57481445f67de0c1c716581f
[6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=6b72caabc47011d03f44064452b2c65e8ed18326

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
2021-12-08 23:59:43 +08:00
Rui Salvaterra
db068bde10 kernel: bump 5.10 to 5.10.79
Manually rebased:
generic/backport-5.10/810-v5.13-usb-ehci-add-spurious-flag-to-disable-overcurrent-ch.patch

Tested-by: John Audia <graysky@archlinux.us>
Tested-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
2021-12-08 23:59:31 +08:00
John Audia
b0c3414252 kernel: bump 5.10 to 5.10.78
All patches automatically rebased.

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

Signed-off-by: John Audia <graysky@archlinux.us>
2021-12-08 23:59:10 +08:00
John Audia
6edf9aba28 kernel: bump 5.4 to 5.4.158
All patches automatically rebased.

Signed-off-by: John Audia <graysky@archlinux.us>
2021-12-08 23:57:50 +08:00