fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-08-15 15:54:38 +08:00
commit 288bb4facc
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
34 changed files with 696 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/Config-kernel.in
View File

@ -1247,6 +1247,12 @@ if KERNEL_IP_PNP
endif
config KERNEL_BTRFS_FS
bool "Compile the kernel with built-in BTRFS support"
help
Say Y here if you want to make the kernel to be able to boot off a
BTRFS partition.
menu "Filesystem ACL and attr support options"
config USE_FS_ACL_ATTR
bool "Use filesystem ACL and attr support by default"

3
package/boot/uboot-envtools/files/mediatek_mt7629
View File

@ -16,6 +16,9 @@ iptime,a6004mx|\
netgear,ex6250-v2)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000"
;;
linksys,ea7500-v3)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x20000"
;;
esac
config_load ubootenv

82
package/boot/uboot-rockchip/Makefile
View File

@ -27,7 +27,7 @@ endef
# RK3308 boards
define U-Boot/Default/rk3308
define U-Boot/rk3308/Default
BUILD_SUBTARGET:=armv8
DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3308
ATF:=$(RK3308_ATF)
@ -35,7 +35,7 @@ define U-Boot/Default/rk3308
endef
define U-Boot/rock-pi-s-rk3308
$(U-Boot/Default/rk3308)
$(U-Boot/rk3308/Default)
DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3308-rock-pi-s
TPL:=$(RK3308_TPL_ROCK_PI_S)
NAME:=ROCK Pi S
@ -46,70 +46,70 @@ endef
# RK3328 boards
define U-Boot/Default/rk3328
define U-Boot/rk3328/Default
BUILD_SUBTARGET:=armv8
DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3328
ATF:=$(RK3328_ATF)
endef
define U-Boot/nanopi-r2c-rk3328
$(U-Boot/Default/rk3328)
$(U-Boot/rk3328/Default)
NAME:=NanoPi R2C
BUILD_DEVICES:= \
friendlyarm_nanopi-r2c
endef
define U-Boot/nanopi-r2c-plus-rk3328
$(U-Boot/Default/rk3328)
$(U-Boot/rk3328/Default)
NAME:=NanoPi R2C Plus
BUILD_DEVICES:= \
friendlyarm_nanopi-r2c-plus
endef
define U-Boot/nanopi-r2s-rk3328
$(U-Boot/Default/rk3328)
$(U-Boot/rk3328/Default)
NAME:=NanoPi R2S
BUILD_DEVICES:= \
friendlyarm_nanopi-r2s
endef
define U-Boot/orangepi-r1-plus-rk3328
$(U-Boot/Default/rk3328)
$(U-Boot/rk3328/Default)
NAME:=Orange Pi R1 Plus
BUILD_DEVICES:= \
xunlong_orangepi-r1-plus
endef
define U-Boot/orangepi-r1-plus-lts-rk3328
$(U-Boot/Default/rk3328)
$(U-Boot/rk3328/Default)
NAME:=Orange Pi R1 Plus LTS
BUILD_DEVICES:= \
xunlong_orangepi-r1-plus-lts
endef
define U-Boot/roc-cc-rk3328
$(U-Boot/Default/rk3328)
$(U-Boot/rk3328/Default)
NAME:=ROC-RK3328-CC
BUILD_DEVICES:= \
firefly_roc-rk3328-cc
endef
define U-Boot/rock-pi-e-rk3328
$(U-Boot/Default/rk3328)
$(U-Boot/rk3328/Default)
NAME:=ROCK Pi E
BUILD_DEVICES:= \
radxa_rock-pi-e
endef
define U-Boot/rock-pi-e-v3-rk3328
$(U-Boot/Default/rk3328)
$(U-Boot/rk3328/Default)
NAME:=ROCK Pi E v3.0
BUILD_DEVICES:= \
radxa_rock-pi-e-v3
endef
define U-Boot/rock64-rk3328
$(U-Boot/Default/rk3328)
$(U-Boot/rk3328/Default)
NAME:=Rock64
BUILD_DEVICES:= \
pine64_rock64
@ -118,28 +118,28 @@ endef
# RK3399 boards
define U-Boot/Default/rk3399
define U-Boot/rk3399/Default
BUILD_SUBTARGET:=armv8
DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3399
ATF:=$(RK3399_ATF)
endef
define U-Boot/guangmiao-g4c-rk3399
$(U-Boot/Default/rk3399)
$(U-Boot/rk3399/Default)
NAME:=GuangMiao G4C
BUILD_DEVICES:= \
huake_guangmiao-g4c
endef
define U-Boot/nanopc-t4-rk3399
$(U-Boot/Default/rk3399)
$(U-Boot/rk3399/Default)
NAME:=NanoPC T4
BUILD_DEVICES:= \
friendlyarm_nanopc-t4
endef
define U-Boot/nanopi-r4s-rk3399
$(U-Boot/Default/rk3399)
$(U-Boot/rk3399/Default)
NAME:=NanoPi R4S
BUILD_DEVICES:= \
friendlyarm_nanopi-r4s \
@ -147,21 +147,21 @@ define U-Boot/nanopi-r4s-rk3399
endef
define U-Boot/nanopi-r4se-rk3399
$(U-Boot/Default/rk3399)
$(U-Boot/rk3399/Default)
NAME:=NanoPi R4SE
BUILD_DEVICES:= \
friendlyarm_nanopi-r4se
endef
define U-Boot/rock-pi-4-rk3399
$(U-Boot/Default/rk3399)
$(U-Boot/rk3399/Default)
NAME:=ROCK Pi 4
BUILD_DEVICES:= \
radxa_rock-pi-4a
endef
define U-Boot/rockpro64-rk3399
$(U-Boot/Default/rk3399)
$(U-Boot/rk3399/Default)
NAME:=RockPro64
BUILD_DEVICES:= \
pine64_rockpro64
@ -170,7 +170,7 @@ endef
# RK3566 boards
define U-Boot/Default/rk3566
define U-Boot/rk3566/Default
BUILD_SUBTARGET:=armv8
DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3566
ATF:=$(RK3566_ATF)
@ -178,7 +178,7 @@ define U-Boot/Default/rk3566
endef
define U-Boot/radxa-cm3-io-rk3566
$(U-Boot/Default/rk3566)
$(U-Boot/rk3566/Default)
NAME:=CM3 IO
BUILD_DEVICES:= \
radxa_cm3-io
@ -187,7 +187,7 @@ endef
# RK3568 boards
define U-Boot/Default/rk3568
define U-Boot/rk3568/Default
BUILD_SUBTARGET:=armv8
DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3568
ATF:=$(RK3568_ATF)
@ -195,56 +195,56 @@ define U-Boot/Default/rk3568
endef
define U-Boot/bpi-r2-pro-rk3568
$(U-Boot/Default/rk3568)
$(U-Boot/rk3568/Default)
NAME:=Bananapi-R2 Pro
BUILD_DEVICES:= \
sinovoip_bpi-r2-pro
endef
define U-Boot/fastrhino-r66s-rk3568
$(U-Boot/Default/rk3568)
$(U-Boot/rk3568/Default)
NAME:=FastRhino R66S
BUILD_DEVICES:= \
lunzn_fastrhino-r66s
endef
define U-Boot/fastrhino-r68s-rk3568
$(U-Boot/Default/rk3568)
$(U-Boot/rk3568/Default)
NAME:=FastRhino R68S
BUILD_DEVICES:= \
lunzn_fastrhino-r68s
endef
define U-Boot/mrkaio-m68s-rk3568
$(U-Boot/Default/rk3568)
$(U-Boot/rk3568/Default)
NAME:=Mrkaio M68S
BUILD_DEVICES:= \
ezpro_mrkaio-m68s
endef
define U-Boot/nanopi-r5c-rk3568
$(U-Boot/Default/rk3568)
$(U-Boot/rk3568/Default)
NAME:=NanoPi R5C
BUILD_DEVICES:= \
friendlyarm_nanopi-r5c
endef
define U-Boot/nanopi-r5s-rk3568
$(U-Boot/Default/rk3568)
$(U-Boot/rk3568/Default)
NAME:=NanoPi R5S
BUILD_DEVICES:= \
friendlyarm_nanopi-r5s
endef
define U-Boot/photonicat-rk3568
$(U-Boot/Default/rk3568)
$(U-Boot/rk3568/Default)
NAME:=Photonicat
BUILD_DEVICES:= \
ariaboard_photonicat
endef
define U-Boot/radxa-e25-rk3568
$(U-Boot/Default/rk3568)
$(U-Boot/rk3568/Default)
DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3568-e25
TPL:=$(RK3568_TPL_E25)
NAME:=E25
@ -253,14 +253,14 @@ define U-Boot/radxa-e25-rk3568
endef
define U-Boot/roc-pc-rk3568
$(U-Boot/Default/rk3568)
$(U-Boot/rk3568/Default)
NAME:=Station P2
BUILD_DEVICES:= \
firefly_roc-rk3568-pc
endef
define U-Boot/rock-3a-rk3568
$(U-Boot/Default/rk3568)
$(U-Boot/rk3568/Default)
NAME:=ROCK 3A
BUILD_DEVICES:= \
radxa_rock-3a
@ -269,7 +269,7 @@ endef
# RK3588 boards
define U-Boot/Default/rk3588
define U-Boot/rk3588/Default
BUILD_SUBTARGET:=armv8
DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3588
ATF:=$(RK3588_ATF)
@ -277,28 +277,28 @@ define U-Boot/Default/rk3588
endef
define U-Boot/nanopc-t6-rk3588
$(U-Boot/Default/rk3588)
$(U-Boot/rk3588/Default)
NAME:=NanoPC T6
BUILD_DEVICES:= \
friendlyarm_nanopc-t6
endef
define U-Boot/orangepi-5-plus-rk3588
$(U-Boot/Default/rk3588)
$(U-Boot/rk3588/Default)
NAME:=OrangePi 5 Plus
BUILD_DEVICES:= \
xunlong_orangepi-5-plus
endef
define U-Boot/rock5b-rk3588
$(U-Boot/Default/rk3588)
$(U-Boot/rk3588/Default)
NAME:=ROCK 5B
BUILD_DEVICES:= \
radxa_rock-5b
endef
define U-Boot/sige7-rk3588
$(U-Boot/Default/rk3588)
$(U-Boot/rk3588/Default)
NAME:=Sige7
BUILD_DEVICES:= \
armsom_sige7
@ -308,28 +308,28 @@ endef
# RK3588S boards
define U-Boot/nanopi-r6c-rk3588s
$(U-Boot/Default/rk3588)
$(U-Boot/rk3588/Default)
NAME:=NanoPi R6C
BUILD_DEVICES:= \
friendlyarm_nanopi-r6c
endef
define U-Boot/nanopi-r6s-rk3588s
$(U-Boot/Default/rk3588)
$(U-Boot/rk3588/Default)
NAME:=NanoPi R6S
BUILD_DEVICES:= \
friendlyarm_nanopi-r6s
endef
define U-Boot/orangepi-5-rk3588s
$(U-Boot/Default/rk3588)
$(U-Boot/rk3588/Default)
NAME:=OrangePi 5
BUILD_DEVICES:= \
xunlong_orangepi-5
endef
define U-Boot/rock5a-rk3588s
$(U-Boot/Default/rk3588)
$(U-Boot/rk3588/Default)
NAME:=ROCK 5A
BUILD_DEVICES:= \
radxa_rock-5a

4
package/firmware/omnia-mcu-firmware/Makefile
View File

@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=omnia-mcu-firmware
PKG_DISTNAME:=omnia_hw_ctrl
PKG_VERSION:=4.0
PKG_VERSION:=4.1
PKG_RELEASE:=1
PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-binaries-v$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/hw/$(PKG_DISTNAME)/-/releases/v$(PKG_VERSION)/downloads/
PKG_HASH:=64b6010f587d89c192685d152644075a5e0abf431eb069ac42981524065a0053
PKG_HASH:=9c6a3d88ae2ca093dd35aace040f0b1eb1cb5c1141575b45623bdd64d733c59f
PKG_MAINTAINER:=Marek Mojik <marek.mojik@nic.cz>
PKG_LICENSE:=GPL-3.0-or-later

93
package/kernel/mac80211/realtek.mk
View File

@ -3,7 +3,8 @@ PKG_DRIVERS += \
rtl8192ce rtl8192se rtl8192de rtl8192cu rtl8723-common rtl8723be rtl8723bs rtl8821ae \
rtl8xxxu rtw88 rtw88-pci rtw88-usb rtw88-sdio rtw88-8821c rtw88-8822b rtw88-8822c \
rtw88-8723d rtw88-8821ce rtw88-8821cu rtw88-8822be rtw88-8822bu \
rtw88-8822ce rtw88-8822cu rtw88-8723de rtw88-8723ds rtw88-8723du
rtw88-8822ce rtw88-8822cu rtw88-8723de rtw88-8723ds rtw88-8723du \
rtw89 rtw89-pci rtw89-8851be rtw89-8852ae rtw89-8852be rtw89-8852ce
config-$(call config_package,rtlwifi) += RTL_CARDS RTLWIFI
config-$(call config_package,rtlwifi-pci) += RTLWIFI_PCI
@ -46,6 +47,16 @@ config-$(call config_package,rtw88-8723du) += RTW88_8723DU
config-$(CONFIG_PACKAGE_RTW88_DEBUG) += RTW88_DEBUG
config-$(CONFIG_PACKAGE_RTW88_DEBUGFS) += RTW88_DEBUGFS
config-$(call config_package,rtw89) += RTW89 RTW89_CORE
config-$(call config_package,rtw89-pci) += RTW89_PCI
config-$(call config_package,rtw89-8851be) += RTW89_8851B RTW89_8851BE
config-$(call config_package,rtw89-8852ae) += RTW89_8852A RTW89_8852AE
config-$(call config_package,rtw89-8852be) += RTW89_8852B RTW89_8852BE
config-$(call config_package,rtw89-8852ce) += RTW89_8852C RTW89_8852CE
config-$(CONFIG_PACKAGE_RTW89_DEBUG) += RTW89_DEBUG
config-$(CONFIG_PACKAGE_RTW89_DEBUGFS) += RTW89_DEBUGFS
config-$(CONFIG_PACKAGE_RTW89_DEBUGMSG) += RTW89_DEBUGMSG
define KernelPackage/rtlwifi/config
config PACKAGE_RTLWIFI_DEBUG
bool "Realtek wireless debugging"
@ -359,3 +370,83 @@ define KernelPackage/rtl8723bs/description
on the 1st gen Intel Compute Stick, the CHIP and many other Intel Atom and ARM
based devices.
endef
define KernelPackage/rtw89/config
config PACKAGE_RTW89_DEBUG
bool "Realtek wireless debugging (rtw89)"
depends on PACKAGE_kmod-rtw89
help
Enable debugging output for rtw89 devices.
config PACKAGE_RTW89_DEBUGFS
bool "Enable rtw89 debugfs support"
select KERNEL_DEBUG_FS
depends on PACKAGE_kmod-rtw89
help
Select this to see extensive information about
the internal state of rtw89 in debugfs.
config PACKAGE_RTW89_DEBUGMSG
bool "Realtek rtw89 debug message support"
depends on PACKAGE_kmod-rtw89
help
Enable debug message support.
endef
define KernelPackage/rtw89
$(call KernelPackage/mac80211/Default)
TITLE:=Realtek RTW89 core
DEPENDS+= +@DRIVER_11AC_SUPPORT +@DRIVER_11AX_SUPPORT +kmod-mac80211
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_core.ko
AUTOLOAD:=$(call AutoProbe,rtw89_core)
HIDDEN:=1
endef
define KernelPackage/rtw89-pci
$(call KernelPackage/mac80211/Default)
TITLE:=Realtek RTW89 PCI chips support
DEPENDS+= @PCI_SUPPORT +kmod-rtw89
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_pci.ko
AUTOLOAD:=$(call AutoProbe,rtw89_pci)
HIDDEN:=1
endef
define KernelPackage/rtw89-8851be
$(call KernelPackage/mac80211/Default)
TITLE:=Realtek RTL8851BE support
DEPENDS+= +kmod-rtw89-pci +rtl8851be-firmware
FILES:= \
$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8851b.ko \
$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8851be.ko
AUTOLOAD:=$(call AutoProbe,rtw89_8851be)
endef
define KernelPackage/rtw89-8852ae
$(call KernelPackage/mac80211/Default)
TITLE:=Realtek RTL8852AE support
DEPENDS+= +kmod-rtw89-pci +rtl8852ae-firmware
FILES:= \
$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852a.ko \
$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852ae.ko
AUTOLOAD:=$(call AutoProbe,rtw89_8852ae)
endef
define KernelPackage/rtw89-8852be
$(call KernelPackage/mac80211/Default)
TITLE:=Realtek RTL8852BE support
DEPENDS+= +kmod-rtw89-pci +rtl8852be-firmware
FILES:= \
$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852b.ko \
$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852be.ko
AUTOLOAD:=$(call AutoProbe,rtw89_8852be)
endef
define KernelPackage/rtw89-8852ce
$(call KernelPackage/mac80211/Default)
TITLE:=Realtek RTL8852CE support
DEPENDS+= +kmod-rtw89-pci +rtl8852ce-firmware
FILES:= \
$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852c.ko \
$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw89/rtw89_8852ce.ko
AUTOLOAD:=$(call AutoProbe,rtw89_8852ce)
endef

2
package/network/services/uhttpd/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git

4
package/network/services/uhttpd/files/uhttpd.config
View File

@ -123,8 +123,8 @@ config uhttpd main
# Defaults for automatic certificate and key generation
config cert defaults
# Validity time
option days 730
# Validity time, 397 days is maximum allowed by CA/Browser forum
option days 397
# key type: rsa or ec
option key_type ec

5
package/network/services/uhttpd/files/uhttpd.init
View File

@ -56,8 +56,9 @@ generate_keys() {
[ -x "$PX5G_BIN" ] && GENKEY_CMD="$PX5G_BIN selfsigned -der"
[ -n "$GENKEY_CMD" ] && {
$GENKEY_CMD \
-days ${days:-730} -newkey ${KEY_OPTS} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
-subj /C="${country:-ZZ}"/ST="${state:-Somewhere}"/L="${location:-Unknown}"/O="${organization:-OpenWrt$UNIQUEID}"/CN="${commonname:-OpenWrt}"
-days ${days:-397} -newkey ${KEY_OPTS} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
-subj /C="${country:-ZZ}"/ST="${state:-Somewhere}"/L="${location:-Unknown}"/O="${organization:-OpenWrt$UNIQUEID}"/CN="${commonname:-OpenWrt}" \
-addext extendedKeyUsage=serverAuth -addext subjectAltName=DNS:"${commonname:-OpenWrt}"
sync
mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"

2
package/system/mtd/src/Makefile
View File

@ -12,7 +12,7 @@ obj.gemini = $(obj.wrgg)
obj.brcm = trx.o
obj.bcm47xx = $(obj.brcm)
obj.bcm53xx = $(obj.brcm) $(obj.seama)
obj.mediatek = $(obj.brcm)
obj.mediatek = $(obj.brcm) linksys_bootcount.o
obj.bcm63xx = imagetag.o
obj.bmips = imagetag.o
obj.ramips = $(obj.brcm) $(obj.seama) $(obj.tpl) $(obj.wrg) linksys_bootcount.o

2
package/utils/px5g-mbedtls/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=px5g-mbedtls
PKG_RELEASE:=10
PKG_RELEASE:=11
PKG_LICENSE:=LGPL-2.1
PKG_BUILD_FLAGS:=no-mips16

67
package/utils/px5g-mbedtls/px5g-mbedtls.c
View File

@ -38,8 +38,13 @@
#include <mbedtls/ecp.h>
#include <mbedtls/rsa.h>
#include <mbedtls/pk.h>
#include <mbedtls/asn1.h>
#include <mbedtls/oid.h>
#define PX5G_VERSION "0.2"
#define SET_OID(x, oid) \
do { x.len = MBEDTLS_OID_SIZE(oid); x.p = (unsigned char *) oid; } while (0)
#define PX5G_VERSION "0.3"
#define PX5G_COPY "Copyright (c) 2009 Steven Barth <steven@midlink.org>"
#define PX5G_LICENSE "Licensed under the GNU Lesser General Public License v2.1"
@ -193,6 +198,16 @@ int selfsigned(char **arg)
mbedtls_pk_context key;
mbedtls_x509write_cert cert;
mbedtls_mpi serial;
mbedtls_x509_san_list *san_list = NULL, *san_prev = NULL, *san_cur = NULL;
/*support
- MBEDTLS_X509_SAN_DNS_NAME
- MBEDTLS_X509_SAN_IP_ADDRESS
- MBEDTLS_X509_SAN_RFC822_NAME
- MBEDTLS_X509_SAN_UNIFORM_RESOURCE_IDENTIFIER
*/
mbedtls_asn1_sequence *eku = NULL, *ext_key_usage = NULL;
char *sanval, *santype;
uint8_t ipaddr[16] = { 0 };
char *subject = "";
unsigned int ksize = 512;
@ -267,8 +282,56 @@ int selfsigned(char **arg)
oldc = delim + 1;
} while(*delim);
arg++;
} else if (!strcmp(*arg, "-addext") && arg[1]) {
mbedtls_asn1_sequence **tail = &eku;
if (!strncmp(arg[1], "extendedKeyUsage=", strlen("extendedKeyUsage="))) {
ext_key_usage = calloc(1, sizeof(mbedtls_asn1_sequence));
ext_key_usage->buf.tag = MBEDTLS_ASN1_OID;
if (!strncmp(arg[1] + strlen("extendedKeyUsage="), "serverAuth", strlen("serverAuth"))) {
SET_OID(ext_key_usage->buf, MBEDTLS_OID_SERVER_AUTH);
} else if (!strncmp(arg[1] + strlen("extendedKeyUsage="), "any", strlen("any"))) {
SET_OID(ext_key_usage->buf, MBEDTLS_OID_ANY_EXTENDED_KEY_USAGE);
} // there are other extendedKeyUsage OIDs but none conceivably useful here
*tail = ext_key_usage;
tail = &ext_key_usage->next;
arg++;
} else if (!strncmp(arg[1], "subjectAltName=", strlen("subjectAltName=")) && strchr(arg[1], ':') != NULL) {
santype = strchr(arg[1], '=') + 1;
sanval = strchr(arg[1], ':') + 1;
//build sAN list
san_cur = calloc(1, sizeof(mbedtls_x509_san_list));
san_cur->next = NULL;
if (!strncmp(santype, "DNS:", strlen("DNS:"))) {
san_cur->node.type = MBEDTLS_X509_SAN_DNS_NAME;
san_cur->node.san.unstructured_name.p = (unsigned char *) sanval;
san_cur->node.san.unstructured_name.len = strlen(sanval);
} else if (!strncmp(santype, "EMAIL:", strlen("EMAIL:"))) {
san_cur->node.type = MBEDTLS_X509_SAN_RFC822_NAME;
san_cur->node.san.unstructured_name.p = (unsigned char *) sanval;
san_cur->node.san.unstructured_name.len = strlen(sanval);
} else if (!strncmp(santype, "IP:", strlen("IP:"))) {
san_cur->node.type = MBEDTLS_X509_SAN_IP_ADDRESS;
mbedtls_x509_crt_parse_cn_inet_pton(sanval, ipaddr);
san_cur->node.san.unstructured_name.p = (unsigned char *) ipaddr;
san_cur->node.san.unstructured_name.len = sizeof(ipaddr);
} else if (!strncmp(santype, "URI:", strlen("URI:"))) {
san_cur->node.type = MBEDTLS_X509_SAN_UNIFORM_RESOURCE_IDENTIFIER;
san_cur->node.san.unstructured_name.p = (unsigned char *) sanval;
san_cur->node.san.unstructured_name.len = strlen(sanval);
}
else fprintf(stderr, "No match to subjectAltName content type.\n");
arg++;
}
}
arg++;
//set the pointers in our san_list linked list
if (san_prev == NULL) {
san_list = san_cur;
} else {
san_prev->next = san_cur;
}
san_prev = san_cur;
}
gen_key(&key, rsa, ksize, exp, curve, pem);
@ -295,6 +358,8 @@ int selfsigned(char **arg)
mbedtls_x509write_crt_set_basic_constraints(&cert, 0, -1);
mbedtls_x509write_crt_set_subject_key_identifier(&cert);
mbedtls_x509write_crt_set_authority_key_identifier(&cert);
mbedtls_x509write_crt_set_subject_alternative_name(&cert, san_list);
mbedtls_x509write_crt_set_ext_key_usage(&cert, ext_key_usage);
_urandom(NULL, (void *) buf, 8);
for (len = 0; len < 8; len++)

128
target/linux/bmips/dts/bcm6328-inteno-xg6846.dts
View File

@ -40,6 +40,12 @@
scl-gpios = <&gpio 19 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
#address-cells = <1>;
#size-cells = <0>;
sfp_eeprom: eeprom@50 {
compatible = "atmel,24c02";
reg = <0x50>;
read-only;
};
};
/* This I2C bus is used for the external CATV connector (usually unused) */
@ -130,6 +136,10 @@
};
};
&ehci {
status = "okay";
};
&ethernet {
status = "okay";
@ -189,6 +199,24 @@
label = "lan1";
phy-handle = <&lan1phy>;
leds {
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
default-state = "keep";
};
led@1 {
reg = <1>;
color = <LED_COLOR_ID_AMBER>;
function = LED_FUNCTION_LAN;
};
};
};
port@1 {
@ -196,6 +224,24 @@
label = "lan2";
phy-handle = <&lan2phy>;
leds {
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
default-state = "keep";
};
led@1 {
reg = <1>;
color = <LED_COLOR_ID_AMBER>;
function = LED_FUNCTION_LAN;
};
};
};
port@2 {
@ -203,6 +249,24 @@
label = "lan3";
phy-handle = <&lan3phy>;
leds {
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
default-state = "keep";
};
led@1 {
reg = <1>;
color = <LED_COLOR_ID_AMBER>;
function = LED_FUNCTION_LAN;
};
};
};
port@3 {
@ -210,6 +274,24 @@
label = "lan4";
phy-handle = <&lan4phy>;
leds {
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
default-state = "keep";
};
led@1 {
reg = <1>;
color = <LED_COLOR_ID_AMBER>;
function = LED_FUNCTION_LAN;
};
};
};
port@4 {
@ -217,6 +299,24 @@
label = "ext1";
phy-handle = <&ext1phy>;
leds {
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WAN;
default-state = "keep";
};
led@1 {
reg = <1>;
color = <LED_COLOR_ID_AMBER>;
function = LED_FUNCTION_WAN;
};
};
};
port@5 {
@ -230,6 +330,24 @@
speed = <1000>;
full-duplex;
};
leds {
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WAN;
default-state = "keep";
};
led@1 {
reg = <1>;
color = <LED_COLOR_ID_AMBER>;
function = LED_FUNCTION_WAN;
};
};
};
port@6 {
@ -282,7 +400,7 @@
};
};
&uart0 {
&ohci {
status = "okay";
};
@ -310,3 +428,11 @@
};
};
};
&uart0 {
status = "okay";
};
&usbh {
status = "okay";
};

1
target/linux/generic/config-5.15
View File

@ -773,6 +773,7 @@ CONFIG_BROKEN_ON_SMP=y
# CONFIG_BTRFS_ASSERT is not set
# CONFIG_BTRFS_DEBUG is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_POSIX_ACL is not set
# CONFIG_BTRFS_FS_REF_VERIFY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set

1
target/linux/generic/config-6.1
View File

@ -819,6 +819,7 @@ CONFIG_BROKEN_ON_SMP=y
# CONFIG_BTRFS_ASSERT is not set
# CONFIG_BTRFS_DEBUG is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_POSIX_ACL is not set
# CONFIG_BTRFS_FS_REF_VERIFY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set

1
target/linux/generic/config-6.6
View File

@ -725,6 +725,7 @@ CONFIG_BROKEN_ON_SMP=y
# CONFIG_BTRFS_ASSERT is not set
# CONFIG_BTRFS_DEBUG is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_POSIX_ACL is not set
# CONFIG_BTRFS_FS_REF_VERIFY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set

2
target/linux/generic/pending-5.15/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ return magic == UBIFS_NODE_MAGIC;
+}
+
+static void __init ubiblock_create_auto_rootfs(void)
+static void ubiblock_create_auto_rootfs(void)
+{
+ int ubi_num, ret, is_ubifs;
+ struct ubi_volume_desc *desc;

2
target/linux/generic/pending-6.1/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ return magic == UBIFS_NODE_MAGIC;
+}
+
+static void __init ubiblock_create_auto_rootfs(struct ubi_volume_info *vi)
+static void ubiblock_create_auto_rootfs(struct ubi_volume_info *vi)
+{
+ int ret, is_ubifs;
+ struct ubi_volume_desc *desc;

2
target/linux/generic/pending-6.6/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ return magic == UBIFS_NODE_MAGIC;
+}
+
+static void __init ubiblock_create_auto_rootfs(struct ubi_volume_info *vi)
+static void ubiblock_create_auto_rootfs(struct ubi_volume_info *vi)
+{
+ int ret, is_ubifs;
+ struct ubi_volume_desc *desc;

3
target/linux/layerscape/armv8_64b/config-6.1
View File

@ -104,9 +104,6 @@ CONFIG_BLK_MQ_VIRTIO=y
CONFIG_BLK_PM=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_BTRFS_FS=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
CONFIG_BTRFS_FS_POSIX_ACL=y
CONFIG_CAVIUM_ERRATUM_22375=y
CONFIG_CAVIUM_ERRATUM_23144=y
CONFIG_CAVIUM_ERRATUM_23154=y

3
target/linux/layerscape/armv8_64b/config-6.6
View File

@ -105,9 +105,6 @@ CONFIG_BLK_MQ_VIRTIO=y
CONFIG_BLK_PM=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_BTRFS_FS=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
CONFIG_BTRFS_FS_POSIX_ACL=y
CONFIG_BUFFER_HEAD=y
CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
CONFIG_CAVIUM_ERRATUM_22375=y

1
target/linux/layerscape/armv8_64b/target.mk
View File

@ -5,6 +5,7 @@
ARCH:=aarch64
BOARDNAME:=ARMv8 64-bit based boards
KERNELNAME:=Image dtbs
DEPENDS:=+@KERNEL_BTRFS_FS +@KERNEL_BTRFS_FS_POSIX_ACL
define Target/Description
Build firmware images for NXP Layerscape ARMv8 64-bit based boards.

300
target/linux/mediatek/dts/mt7629-linksys-ea7500-v3.dts Normal file
View File

@ -0,0 +1,300 @@
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
#include "mt7629.dtsi"
/ {
model = "Linksys EA7500 v3";
compatible = "linksys,ea7500-v3", "mediatek,mt7629";
aliases {
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
bootargs-override = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";
led_power: power {
function = LED_FUNCTION_POWER;
color = <LED_COLOR_ID_WHITE>;
gpios = <&pio 52 GPIO_ACTIVE_HIGH>;
};
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&pio 60 GPIO_ACTIVE_LOW>;
};
wps {
label = "wps";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&pio 58 GPIO_ACTIVE_LOW>;
};
};
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x10000000>;
};
reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed";
regulator-name = "fixed-3.3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
regulator-always-on;
};
reg_5v: regulator-5v {
compatible = "regulator-fixed";
regulator-name = "fixed-5V";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-boot-on;
regulator-always-on;
};
};
&eth {
pinctrl-names = "default";
pinctrl-0 = <&eth_pins>;
pinctrl-1 = <&ephy_leds_pins>;
status = "okay";
gmac0: mac@0 {
compatible = "mediatek,eth-mac";
reg = <0>;
phy-mode = "2500base-x";
fixed-link {
speed = <2500>;
full-duplex;
pause;
};
};
gmac1: mac@1 {
compatible = "mediatek,eth-mac";
reg = <1>;
phy-mode = "gmii";
phy-handle = <&phy0>;
};
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
phy0: ethernet-phy@0 {
reg = <0>;
};
switch@1f {
compatible = "mediatek,mt7531";
reg = <31>;
reset-gpios = <&pio 28 0>;
interrupt-controller;
#interrupt-cells = <1>;
interrupt-parent = <&pio>;
interrupts = <6 IRQ_TYPE_LEVEL_HIGH>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan1";
};
port@1 {
reg = <1>;
label = "lan2";
};
port@2 {
reg = <2>;
label = "lan3";
};
port@3 {
reg = <3>;
label = "lan4";
};
port@6 {
reg = <6>;
ethernet = <&gmac0>;
phy-mode = "2500base-x";
fixed-link {
speed = <2500>;
full-duplex;
pause;
};
};
};
};
};
};
&bch {
status = "okay";
};
&snfi {
pinctrl-names = "default";
pinctrl-0 = <&serial_nand_pins>;
status = "okay";
flash@0 {
compatible = "spi-nand";
reg = <0>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
nand-ecc-engine = <&snfi>;
mediatek,bmt-v2;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "Bootloader";
reg = <0x0 0x100000>;
read-only;
};
partition@100000 {
label = "Config";
reg = <0x100000 0x40000>;
};
partition@140000 {
label = "Factory";
reg = <0x140000 0x80000>;
read-only;
};
partition@1c0000 {
label = "kernel";
reg = <0x1c0000 0x800000>;
};
partition@9c0000 {
label = "ubi";
reg = <0x9c0000 0x2000000>;
};
partition@29c0000 {
label = "Kernel2";
reg = <0x29c0000 0x2800000>;
read-only;
};
partition@51c0000 {
label = "devinfo";
reg = <0x51c0000 0x40000>;
read-only;
};
partition@5200000 {
label = "sysdiag";
reg = <0x5200000 0x100000>;
read-only;
};
partition@5300000 {
label = "syscfg";
reg = <0x5300000 0x2000000>;
read-only;
};
partition@7300000 {
label = "s_env";
reg = <0x7300000 0x40000>;
};
};
};
};
&pio {
eth_pins: eth-pins {
mux {
function = "eth";
groups = "mdc_mdio";
};
};
ephy_leds_pins: ephy-leds-pins {
mux {
function = "led";
groups = "ephy_leds";
};
};
/* Serial NAND is shared pin with SPI-NOR */
serial_nand_pins: serial-nand-pins {
mux {
function = "flash";
groups = "snfi";
};
};
uart0_pins: uart0-pins {
mux {
function = "uart";
groups = "uart0_txd_rxd" ;
};
};
watchdog_pins: watchdog-pins {
mux {
function = "watchdog";
groups = "watchdog";
};
};
};
&ssusb {
vusb33-supply = <&reg_3p3v>;
vbus-supply = <&reg_5v>;
status = "okay";
};
&u3phy0 {
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins>;
status = "okay";
};
&watchdog {
pinctrl-names = "default";
pinctrl-0 = <&watchdog_pins>;
status = "okay";
interrupt-controller;
#interrupt-cells = <1>;
interrupt-parent = <&pio>;
interrupts = <GIC_SPI 0x80 IRQ_TYPE_EDGE_FALLING>;
};

16
target/linux/mediatek/image/mt7629.mk
View File

@ -27,6 +27,22 @@ define Device/iptime_a6004mx
endef
TARGET_DEVICES += iptime_a6004mx
define Device/linksys_ea7500-v3
$(Device/uimage-lzma-loader)
DEVICE_VENDOR := Linksys
DEVICE_MODEL := EA7500
DEVICE_VARIANT := v3
DEVICE_DTS := mt7629-linksys-ea7500-v3
DEVICE_DTS_DIR := ../dts
DEVICE_PACKAGES := kmod-usb3 uboot-envtools
IMAGE_SIZE := 40m
UBINIZE_OPTS := -E 5
BLOCKSIZE := 128k
PAGESIZE := 2048
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata | check-size
endef
TARGET_DEVICES += linksys_ea7500-v3
define Device/netgear_ex6250-v2
DEVICE_VENDOR := NETGEAR
DEVICE_MODEL := EX6250

8
target/linux/mediatek/mt7629/base-files/etc/board.d/02_network
View File

@ -8,7 +8,8 @@ mediatek_setup_interfaces()
local board="$1"
case $board in
iptime,a6004mx)
iptime,a6004mx|\
linksys,ea7500-v3)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "eth1"
;;
mediatek,mt7629-rfb)
@ -28,6 +29,11 @@ mediatek_setup_macs()
local board="$1"
case $board in
linksys,ea7500-v3)
lan_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
wan_mac=$lan_mac
label_mac=$lan_mac
;;
netgear,ex6250-v2)
lan_mac=$(mtd_get_mac_ascii Config mac)
label_mac=$lan_mac

3
target/linux/mediatek/mt7629/base-files/etc/init.d/bootcount
View File

@ -13,5 +13,8 @@ boot() {
exit 1
fi
;;
linksys,ea7500-v3)
mtd resetbc s_env || true
;;
esac
}

5
target/linux/mediatek/mt7629/base-files/lib/upgrade/platform.sh
View File

@ -12,6 +12,11 @@ platform_do_upgrade() {
iptime,a6004mx)
nand_do_upgrade "$1"
;;
linksys,ea7500-v3)
fw_setenv boot_part 1
fw_setenv bootimage 1
nand_do_upgrade "$1"
;;
*)
default_do_upgrade "$1"
;;

3
target/linux/mpc85xx/p1010/config-default
View File

@ -1,4 +1,3 @@
CONFIG_AT803X_PHY=y
CONFIG_BR200_WP=y
CONFIG_CMDLINE_OVERRIDE=y
CONFIG_FIREBOX_T10=y
@ -21,6 +20,8 @@ CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT=y
CONFIG_NET_DSA_TAG_QCA=y
CONFIG_NET_SWITCHDEV=y
CONFIG_PHYLINK=y
CONFIG_QCA83XX_PHY=y
CONFIG_QCOM_NET_PHYLIB=y
CONFIG_REALTEK_PHY=y
CONFIG_RED_15W_REV1=y
CONFIG_REGMAP=y

1
target/linux/rockchip/image/armv8.mk
View File

@ -308,6 +308,7 @@ define Device/radxa_rock-pi-s
DEVICE_VENDOR := Radxa
DEVICE_MODEL := ROCK Pi S
SOC := rk3308
SUPPORTED_DEVICES := radxa,rockpis
BOOT_FLOW := pine64-img
BOOT_SCRIPT := rock-pi-s
DEVICE_PACKAGES := kmod-rtw88-8723ds kmod-usb-net-cdc-ncm kmod-usb-net-rndis wpad-openssl

4
tools/cmake/Makefile
View File

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=cmake
PKG_VERSION:=3.29.5
PKG_VERSION:=3.30.2
PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
PKG_RELEASE:=1
PKG_CPE_ID:=cpe:/a:kitware:cmake
@ -15,7 +15,7 @@ PKG_CPE_ID:=cpe:/a:kitware:cmake
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \
https://cmake.org/files/v$(PKG_VERSION_MAJOR)/
PKG_HASH:=dd63da7d763c0db455ca232f2c443f5234fe0b11f8bd6958a81d29cc987dfd6e
PKG_HASH:=46074c781eccebc433e98f0bbfa265ca3fd4381f245ca3b140e7711531d60db2
HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1

6
tools/cmake/patches/110-liblzma.patch
View File

@ -1,8 +1,8 @@
--- a/Modules/FindLibLZMA.cmake
+++ b/Modules/FindLibLZMA.cmake
@@ -58,7 +58,13 @@ The following variables are provided for
#]=======================================================================]
@@ -61,7 +61,13 @@ The following variables are provided for
cmake_policy(PUSH)
cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_<n>
-find_path(LIBLZMA_INCLUDE_DIR lzma.h )
+if(UNIX)

2
tools/cmake/patches/120-curl-fix-libressl-linking.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -647,6 +647,14 @@ if(CURL_USE_OPENSSL)
@@ -648,6 +648,14 @@ if(CURL_USE_OPENSSL)
endif()
set(SSL_ENABLED ON)
set(USE_OPENSSL ON)

2
tools/cmake/patches/130-bootstrap_parallel_make_flag.patch
View File

@ -1,6 +1,6 @@
--- a/bootstrap
+++ b/bootstrap
@@ -1493,7 +1493,10 @@ int main(){ printf("1%c", (char)0x0a); r
@@ -1509,7 +1509,10 @@ int main(){ printf("1%c", (char)0x0a); r
' > "test.c"
cmake_original_make_flags="${cmake_make_flags}"
if test "x${cmake_parallel_make}" != "x"; then

2
tools/cmake/patches/140-zlib.patch
View File

@ -1,6 +1,6 @@
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -117,10 +117,13 @@ else()
@@ -120,10 +120,13 @@ else()
set(ZLIB_NAMES_DEBUG zd zlibd zdlld zlibd1 zlib1d zlibstaticd zlibwapid zlibvcd zlibstatd)
endif()

4
tools/cmake/patches/160-disable_xcode_generator.patch
View File

@ -1,6 +1,6 @@
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -846,7 +846,7 @@ if(CMake_USE_XCOFF_PARSER)
@@ -858,7 +858,7 @@ if(CMake_USE_XCOFF_PARSER)
endif()
# Xcode only works on Apple
@ -11,7 +11,7 @@
PRIVATE
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -132,7 +132,7 @@
@@ -134,7 +134,7 @@
# include "cmGlobalGhsMultiGenerator.h"
#endif