[PATCH v4 1/4] ipq806x: add support for Linksys E8350 v1
Signed-off-by: Todor Colov
---
.../ipq806x/base-files/etc/board.d/01_leds| 3 +
.../ipq806x/base-files/etc/board.d/02_network | 1 +
.../base-files/lib/upgrade/platform.sh| 3 +-
.../arm/boot/dts/qcom-ipq8064-e8350-v1.dts| 246 ++
target/linux/ipq806x/image/Makefile | 29 +++
.../0069-arm-boot-add-dts-files.patch | 3 +-
6 files changed, 283 insertions(+), 2 deletions(-)
create mode 100644
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-e8350-v1.dts
diff --git a/target/linux/ipq806x/base-files/etc/board.d/01_leds
b/target/linux/ipq806x/base-files/etc/board.d/01_leds
index 620fc12f41..e7f0b8dd7a 100755
--- a/target/linux/ipq806x/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq806x/base-files/etc/board.d/01_leds
@@ -23,6 +23,9 @@ edgecore,ecw5410)
ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:green:wlan2g"
"phy1tpt"
ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:green:wlan5g"
"phy0tpt"
;;
+linksys,e8350-v1)
+ucidef_set_led_wlan "wlan" "WLAN" "${boardname}:green:wifi" "phy0tpt"
+;;
nec,wg2600hp)
ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:green:wlan2g"
"phy1tpt"
ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:green:wlan5g"
"phy0tpt"
diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network
b/target/linux/ipq806x/base-files/etc/board.d/02_network
index 3f9d96881d..88ec76b2c9 100755
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -60,6 +60,7 @@ qcom,ipq8064-db149)
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "6u@eth1" "5:wan" "0u@eth0"
;;
+linksys,e8350-v1 |\
zyxel,nbg6817)
hw_mac_addr=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
ucidef_add_switch "switch0" \
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
index f61e8ee878..f1df0a4d3a 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
@@ -1,7 +1,7 @@
PART_NAME=firmware
REQUIRE_IMAGE_METADATA=1
-RAMFS_COPY_BIN='fw_printenv fw_setenv'
+RAMFS_COPY_BIN='fw_printenv fw_setenv fwtool'
RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
platform_check_image() {
@@ -16,6 +16,7 @@ platform_do_upgrade() {
nand_do_upgrade "$1"
;;
compex,wpq864|\
+ linksys,e8350-v1|\
netgear,d7800 |\
netgear,r7500 |\
netgear,r7500v2 |\
diff --git
a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-e8350-v1.dts
b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-e8350-v1.dts
new file mode 100644
index 00..cc478963c7
--- /dev/null
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-e8350-v1.dts
@@ -0,0 +1,246 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+#include "qcom-ipq8064-v2.0.dtsi"
+
+#include
+#include
+
+/ {
+ model = "Linksys E8350 V1 WiFi Router";
+ compatible = "linksys,e8350-v1", "qcom,ipq8064";
+
+ memory@0 {
+ reg = <0x4200 0x1e00>;
+ device_type = "memory";
+ };
+
+ aliases {
+ serial0 = _serial;
+
+ led-boot = _power;
+ led-failsafe = _power;
+ led-running = _power;
+ led-upgrade = _power;
+ };
+
+ keys {
+ compatible = "gpio-keys";
+ pinctrl-0 = <_pins>;
+ pinctrl-names = "default";
+
+ reset {
+ label = "reset";
+ gpios = <_pinmux 68 GPIO_ACTIVE_LOW>;
+ linux,code = ;
+ };
+
+ wps {
+ label = "wps";
+ gpios = <_pinmux 65 GPIO_ACTIVE_LOW>;
+ linux,code = ;
+ };
+
+ wifi {
+ label = "wifi";
+ gpios = <_pinmux 67 GPIO_ACTIVE_LOW>;
+ linux,code = ;
+ };
+ };
+
+ nand-controller@1ac0 {
+ compatible = "qcom,ipq806x-nand";
+ reg = <0x1ac0 0x800>;
+ clocks = < EBI2_CLK>,
+ < EBI2_AON_CLK>;
+ clock-names = "core", "aon";
+ dmas = <_dma 3>;
+ dma-names = "rxtx";
+ qcom,cmd-crci = <15>;
+ qcom,data-crci = <3>;
+
+ nand@0 {
+ reg = <0>;
+
+ nand-ecc-strength = <4>;
+ nand-bus-width = <8>;
+
+ partitions {
+ compatible = "fixed-partitions";
+
+ partition@0 {
+
[PATCH v4 2/4] package: fix nand.sh fwtool trailer removal for UBIFS
Signed-off-by: Todor Colov
---
package/base-files/files/lib/upgrade/nand.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/base-files/files/lib/upgrade/nand.sh
b/package/base-files/files/lib/upgrade/nand.sh
index ad04bbc753..91eea3bd3a 100644
--- a/package/base-files/files/lib/upgrade/nand.sh
+++ b/package/base-files/files/lib/upgrade/nand.sh
@@ -224,6 +224,7 @@ nand_upgrade_ubinized() {
local mtddev="/dev/mtd${mtdnum}"
ubidetach -p "${mtddev}" || true
sync
+ fwtool -q -t -i /dev/null "$1"
ubiformat "${mtddev}" -y -f "${ubi_file}"
ubiattach -p "${mtddev}"
nand_do_upgrade_success
--
2.28.0
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v4 4/4] tools: addfwhrd Linksys E8350v1 FW header genarator
Signed-off-by: Todor Colov
---
tools/firmware-utils/Makefile | 1 +
tools/firmware-utils/src/addfwhdr.c | 233
2 files changed, 234 insertions(+)
create mode 100644 tools/firmware-utils/src/addfwhdr.c
diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index 39c3503886..b83acc7652 100644
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -25,6 +25,7 @@ endef
define Host/Compile
mkdir -p $(HOST_BUILD_DIR)/bin
$(call cc,add_header)
+ $(call cc,addfwhdr cyg_crc32)
$(call cc,addpattern)
$(call cc,asustrx)
$(call cc,buffalo-enc buffalo-lib,-Wall)
diff --git a/tools/firmware-utils/src/addfwhdr.c
b/tools/firmware-utils/src/addfwhdr.c
new file mode 100644
index 00..ada56e6abf
--- /dev/null
+++ b/tools/firmware-utils/src/addfwhdr.c
@@ -0,0 +1,233 @@
+/*
+ Linksys e8350 v1 firmware header generator
+*/
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "cyg_crc.h"
+#define AC2350 20
+#define USA 1
+
+#if LOCALE == USA
+ #define CYBERTAN_VERSION"v1.0.03"
+ #define SERIAL_NUMBER "003"
+ #define MINOR_VERSION ""
+ #define BUILD_KEYWORD " B"
+ #define BUILD_NUMBERSERIAL_NUMBER
+ #define BETA_VERSION" "
+ #define CYBERTAN_UBOOT_VERSION "v1.0"
+#else // ETSI
+ #define CYBERTAN_VERSION"v1.0.00"
+ #define SERIAL_NUMBER "01"
+ #define MINOR_VERSION ""
+ #define BUILD_KEYWORD " B"
+ #define BUILD_NUMBERSERIAL_NUMBER
+ #define BETA_VERSION" "
+ #define CYBERTAN_UBOOT_VERSION "v1.0"
+#endif
+
+//add for AC2350 F/W header
+#define FWHDR_MAGIC_STR "CHDR"
+#define FWHDR_MAGIC 0X52444843
+struct cbt_fw_header
+{
+ unsigned int magic; /* "CHDR" */
+ unsigned int len; /* Length of file including header */
+ unsigned int crc32; /* 32-bit CRC */
+ unsigned int res;
+};
+
+#define MAX_BUF1024
+#define CRC32_INIT_VALUE 0x/* Initial CRC32 checksum value */
+
+#ifndef TYPEDEF_UINT8
+typedef unsigned char uint8;
+#endif
+
+#ifndef TYPEDEF_UINT16
+typedef unsigned short uint16;
+#endif
+
+#ifndef TYPEDEF_UINT32
+typedef unsigned intuint32;
+#endif
+
+typedef uint32_t cyg_uint32;
+typedef uint16_t cyg_uint16;
+
+extern cyg_uint32 cyg_crc32_accumulate(cyg_uint32 crc32val, unsigned char *s,
int len);
+//extern uint32 crc32(uint8 *pdata, uint nbytes, uint32 crc);
+
+int fd, fd_w;
+
+void die(const char * str, ...)
+{
+ va_list args;
+ va_start(args, str);
+ vfprintf(stderr, str, args);
+ fputc('\n', stderr);
+ exit(1);
+}
+
+int fill_null0(int size)
+{
+ unsigned char buf[1];
+ int i;
+
+ fprintf(stderr,"Fill null\n");
+
+ buf[0] = 0xff;
+ for (i=0 ; i< size; i++ )
+ if (write(fd_w, buf, 1) != 1)
+ return 0;
+
+ return 1;
+}
+
+long file_open(const char *name)
+{
+ struct stat sb;
+ if ((fd = open(name, O_RDONLY, 0)) < 0){
+ die("Unable to open `%s' : %m", name);
+ }
+
+ if (fstat (fd, ))
+ die("Unable to stat `%s' : %m", name);
+
+ return sb.st_size;
+}
+
+void usage(void)
+{
+ die("Usage: addfwhdr [-i|--input] sysupgrade.o [-o|--output]
code.bin\n");
+}
+
+int main(int argc, char ** argv)
+{
+ uint input_size,c;
+ char *input_file=NULL, *output_file=NULL;
+ int opt;
+ int option_index=0;
+ int garbage = 0;
+ char *buf = NULL;
+ extern char *optarg;
+ extern int optind, opterr, optopt;
+
+ struct cbt_fw_header *fwhdr;
+ uint32 crc;
+
+ static struct option long_options[] =
+ {
+ {"input", 1, 0, 'i'},
+ {"output", 1, 0, 'o'},
+ {"garbage", 0, 0, 'g'},
+ {0, 0, 0, 0}
+ };
+
+ printf("\n-- add fw header \n");
+
+ fwhdr = malloc(sizeof(struct cbt_fw_header));
+ memset(fwhdr, 0, sizeof(struct cbt_fw_header));
+
+ while(1){
+ opt = getopt_long(argc, argv, "i:o:g",long_options,
_index);
+ if(opt == -1)
+ break;
+ switch(opt){
+ case 'h' :
+ usage(); break;
+ case 'i' :
+ input_file = optarg;
+ printf("input file is [%s]\n",input_file);
break;
+ case 'o' :
+ output_file = optarg;
+ printf("output file is [%s]\n",output_file);
break;
+ case 'g' :
+ garbage = 1; break;
+ default :
+
[PATCH v4 3/4] package: fix wifi off/on functional button
Signed-off-by: Todor Colov
---
package/base-files/files/etc/rc.button/rfkill | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/base-files/files/etc/rc.button/rfkill
b/package/base-files/files/etc/rc.button/rfkill
index fbdda40ed5..2d4f0f86ff 100755
--- a/package/base-files/files/etc/rc.button/rfkill
+++ b/package/base-files/files/etc/rc.button/rfkill
@@ -27,6 +27,6 @@ case "${TYPE}" in
esac
config_foreach wifi_rfkill_set wifi-device
uci commit wireless
-wifi up
+wifi
return 0
--
2.28.0
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v4 0/4] ipq806x: add support for Linksys E8350-v1
bundle of 4 patches to add support for Linksys E8350 dual band wifi router type AC2350 FCC ID: Q87-E8350 - device specifications are already in place under the openwrt wiki URL: https://openwrt.org/inbox/toh/linksys/linksys_ea8350_1$ - successful test firmware has been confirmed by me and several users under developer forum: https://forum.openwrt.org/t/e8350-why-not-supported-by-openwrt/57640/73 MAC addresses: via system.sh function: mtd_get_mac_ascii 0:APPSBLENV ethaddr - LAN/WAN interfaces: via /etc/board.d/02_network ethaddr mac: +2 / +3 - WLAN ath10k 2Ghz: via /etc/hotplug.d/firmware/11-ath10k-caldata ethaddr mac: +1 - WLAN quantenna 5Ghz: set during quantenna firmware load - it has separate SPI flash not accessible via Openwrt OS The device label lists only one mac address Installation: via stock WEB interface Notes: Quantenna 5Ghz Wifi requires separate packages for loading its firmware and driver which will be packaged outside this submission via the package feeds. Todor Colov (4): ipq806x: add support for Linksys E8350 v1 package: fix nand.sh fwtool trailer removal for UBIFS package: fix wifi off/on functional button tools: addfwhrd Linksys E8350v1 FW header genarator package/base-files/files/etc/rc.button/rfkill | 2 +- package/base-files/files/lib/upgrade/nand.sh | 1 + .../ipq806x/base-files/etc/board.d/01_leds| 3 + .../ipq806x/base-files/etc/board.d/02_network | 1 + .../base-files/lib/upgrade/platform.sh| 3 +- .../arm/boot/dts/qcom-ipq8064-e8350-v1.dts| 246 ++ target/linux/ipq806x/image/Makefile | 29 +++ .../0069-arm-boot-add-dts-files.patch | 3 +- tools/firmware-utils/Makefile | 1 + tools/firmware-utils/src/addfwhdr.c | 233 + 10 files changed, 519 insertions(+), 3 deletions(-) create mode 100644 target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-e8350-v1.dts create mode 100644 tools/firmware-utils/src/addfwhdr.c -- 2.28.0 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 19.07] openssl: bump to 1.1.1h
This is a bug-fix release. Patches were refreshed.
Signed-off-by: Eneas U de Queiroz
(cherry picked from commit 475838de1a33d49d1a0b81aad374a8db6dd2b3c8)
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index 8fe00d970b..9696748106 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
PKG_BASE:=1.1.1
-PKG_BUGFIX:=g
+PKG_BUGFIX:=h
PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
@@ -24,7 +24,7 @@ PKG_SOURCE_URL:= \
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \
http://www.openssl.org/source/ \
http://www.openssl.org/source/old/$(PKG_BASE)/
-PKG_HASH:=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+PKG_HASH:=5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9
PKG_LICENSE:=OpenSSL
PKG_LICENSE_FILES:=LICENSE
diff --git a/package/libs/openssl/patches/100-Configure-afalg-support.patch
b/package/libs/openssl/patches/100-Configure-afalg-support.patch
index 0f91a9d5da..98944103b5 100644
--- a/package/libs/openssl/patches/100-Configure-afalg-support.patch
+++ b/package/libs/openssl/patches/100-Configure-afalg-support.patch
@@ -12,7 +12,7 @@ diff --git a/Configure b/Configure
index 5a699836f3..74d057c219 100755
--- a/Configure
+++ b/Configure
-@@ -1532,7 +1532,9 @@ unless ($disabled{"crypto-mdebug-backtrace"})
+@@ -1545,7 +1545,9 @@ unless ($disabled{"crypto-mdebug-backtrace"})
unless ($disabled{afalgeng}) {
$config{afalgeng}="";
diff --git a/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch
b/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch
index fa79cc6022..7f33cb9dae 100644
--- a/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch
+++ b/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch
@@ -11,7 +11,7 @@ diff --git a/Configure b/Configure
index 74d057c219..5813e9f8fe 100755
--- a/Configure
+++ b/Configure
-@@ -296,7 +296,7 @@ my $auto_threads=1;# enable threads automatically?
true by default
+@@ -318,7 +318,7 @@ my $auto_threads=1;# enable threads automatically?
true by default
my $default_ranlib;
# Top level directories to build
@@ -20,7 +20,7 @@ index 74d057c219..5813e9f8fe 100755
# crypto/ subdirectories to build
$config{sdirs} = [
"objects",
-@@ -308,7 +308,7 @@ $config{sdirs} = [
+@@ -330,7 +330,7 @@ $config{sdirs} = [
"cms", "ts", "srp", "cmac", "ct", "async", "kdf", "store"
];
# test/ subdirectories to build
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH] toolchain/binutils: update to 2.35.1
Update binutils 2.35 to 2.35.1
Signed-off-by: DENG Qingfang
---
toolchain/binutils/Config.in| 6 +++---
toolchain/binutils/Config.version | 4 ++--
toolchain/binutils/Makefile | 4 ++--
.../{2.35 => 2.35.1}/300-001_ld_makefile_patch.patch| 0
.../{2.35 => 2.35.1}/400-mips_no_dynamic_linking_sym.patch | 0
.../500-Change-default-emulation-for-mips64-linux.patch | 0
6 files changed, 7 insertions(+), 7 deletions(-)
rename toolchain/binutils/patches/{2.35 =>
2.35.1}/300-001_ld_makefile_patch.patch (100%)
rename toolchain/binutils/patches/{2.35 =>
2.35.1}/400-mips_no_dynamic_linking_sym.patch (100%)
rename toolchain/binutils/patches/{2.35 =>
2.35.1}/500-Change-default-emulation-for-mips64-linux.patch (100%)
diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 2303888f12..3d9e8284e9 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -14,9 +14,9 @@ choice
bool "Binutils 2.34"
select BINUTILS_VERSION_2_34
- config BINUTILS_USE_VERSION_2_35
- bool "Binutils 2.35"
- select BINUTILS_VERSION_2_35
+ config BINUTILS_USE_VERSION_2_35_1
+ bool "Binutils 2.35.1"
+ select BINUTILS_VERSION_2_35_1
endchoice
config EXTRA_BINUTILS_CONFIG_OPTIONS
diff --git a/toolchain/binutils/Config.version
b/toolchain/binutils/Config.version
index 9d43675f1a..ed3018328e 100644
--- a/toolchain/binutils/Config.version
+++ b/toolchain/binutils/Config.version
@@ -5,11 +5,11 @@ config BINUTILS_VERSION_2_34
default y if !TOOLCHAINOPTS
bool
-config BINUTILS_VERSION_2_35
+config BINUTILS_VERSION_2_35_1
bool
config BINUTILS_VERSION
string
default "2.32" if BINUTILS_VERSION_2_32
default "2.34" if BINUTILS_VERSION_2_34
- default "2.35" if BINUTILS_VERSION_2_35
+ default "2.35.1"if BINUTILS_VERSION_2_35_1
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 204ff3..da86794480 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -23,8 +23,8 @@ ifeq ($(PKG_VERSION),2.34)
PKG_HASH:=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952
endif
-ifeq ($(PKG_VERSION),2.35)
- PKG_HASH:=1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85
+ifeq ($(PKG_VERSION),2.35.1)
+ PKG_HASH:=3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
endif
HOST_BUILD_PARALLEL:=1
diff --git a/toolchain/binutils/patches/2.35/300-001_ld_makefile_patch.patch
b/toolchain/binutils/patches/2.35.1/300-001_ld_makefile_patch.patch
similarity index 100%
rename from toolchain/binutils/patches/2.35/300-001_ld_makefile_patch.patch
rename to toolchain/binutils/patches/2.35.1/300-001_ld_makefile_patch.patch
diff --git
a/toolchain/binutils/patches/2.35/400-mips_no_dynamic_linking_sym.patch
b/toolchain/binutils/patches/2.35.1/400-mips_no_dynamic_linking_sym.patch
similarity index 100%
rename from
toolchain/binutils/patches/2.35/400-mips_no_dynamic_linking_sym.patch
rename to
toolchain/binutils/patches/2.35.1/400-mips_no_dynamic_linking_sym.patch
diff --git
a/toolchain/binutils/patches/2.35/500-Change-default-emulation-for-mips64-linux.patch
b/toolchain/binutils/patches/2.35.1/500-Change-default-emulation-for-mips64-linux.patch
similarity index 100%
rename from
toolchain/binutils/patches/2.35/500-Change-default-emulation-for-mips64-linux.patch
rename to
toolchain/binutils/patches/2.35.1/500-Change-default-emulation-for-mips64-linux.patch
--
2.25.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: Meson files missing breaking build
On 27/09/2020 21:44, Philip Prindeville wrote: On Sep 27, 2020, at 12:13 AM, Andre Heider wrote: On 27/09/2020 00:02, Philip Prindeville wrote: Hi. I’m having issues building a lot of packages lately, going back to June or July. Not sure what changed then. Maybe the 0.54.3 update to Meson? Various things like lighttpd and glib2 don’t want to build because of Meson. I get errors like this: make[2]: Entering directory '/home/philipp/lede/feeds/packages/libs/glib2' touch /home/philipp/lede/build_dir/target-x86_64_musl/glib-2.65.2/.prepared_4c066b52530f924da7f5ef0d019bc503_6664517399ebbbc92a37c5bb081b5c53_check . /home/philipp/lede/include/shell.sh; xzcat /home/philipp/lede/dl/glib-2.65.2.tar.xz | tar -C /home/philipp/lede/build_dir/target-x86_64_musl/glib-2.65.2/.. -xf - [ ! -d ./src/ ] || cp -fpR ./src/. /home/philipp/lede/build_dir/target-x86_64_musl/glib-2.65.2 Applying ./patches/001-no-libelf.patch using plaintext: patching file gio/meson.build Applying ./patches/002-no-tests.patch using plaintext: patching file meson.build Applying ./patches/003-valgrind.h-mips16-fix.patch using plaintext: patching file glib/valgrind.h Applying ./patches/004-no-distutils.patch using plaintext: patching file meson.build Applying ./patches/005-uclibc.patch using plaintext: patching file meson.build touch /home/philipp/lede/build_dir/target-x86_64_musl/glib-2.65.2/.prepared_4c066b52530f924da7f5ef0d019bc503_6664517399ebbbc92a37c5bb081b5c53 rm -f /home/philipp/lede/build_dir/target-x86_64_musl/glib-2.65.2/.configured_* rm -f /home/philipp/lede/staging_dir/target-x86_64_musl/stamp/.glib2_installed /home/philipp/lede/staging_dir/host/bin/sed -e "s|@CC@|'gcc',|" -e "s|@CXX@|'g++',|" -e "s|@PKGCONFIG@|/home/philipp/lede/staging_dir/host/bin/pkg-config|" -e "s|@CFLAGS@|'-O2', '-I/home/philipp/lede/staging_dir/host/include', '-I/home/philipp/lede/staging_dir/hostpkg/include', '-I/home/philipp/lede/staging_dir/target-x86_64_musl/host/include', '-I/home/philipp/lede/staging_dir/host/include', '-I/home/philipp/lede/staging_dir/hostpkg/include', '-I/home/philipp/lede/staging_dir/target-x86_64_musl/host/include',|" -e "s|@CXXFLAGS@|'-I/home/philipp/lede/staging_dir/host/include', '-I/home/philipp/lede/staging_dir/hostpkg/include', '-I/home/philipp/lede/staging_dir/target-x86_64_musl/host/include',|" -e "s|@LDFLAGS@|'-L/home/philipp/lede/staging_dir/host/lib', '-L/home/philipp/lede/staging_dir/hostpkg/lib', '-L/home/philipp/lede/staging_dir/target-x86_64_musl/host/lib', '-liconv', '-Wl,-rpath,/home/philipp/lede/staging_dir/hostpkg/lib',|" -e "s|@PREFIX@|/home/philipp/lede/staging_dir/hostpkg|" < /home/philipp/lede/staging_dir/hostpkg/lib/meson/openwrt-native.txt.in > /home/philipp/lede/build_dir/target-x86_64_musl/glib-2.65.2/openwrt-native.txt bash: /home/philipp/lede/staging_dir/hostpkg/lib/meson/openwrt-native.txt.in: No such file or directory Makefile:142: recipe for target '/home/philipp/lede/build_dir/target-x86_64_musl/glib-2.65.2/.configured_efb2d3cf01c707184fb77fd0fe149f94' failed make[2]: *** [/home/philipp/lede/build_dir/target-x86_64_musl/glib-2.65.2/.configured_efb2d3cf01c707184fb77fd0fe149f94] Error 1 make[2]: Leaving directory '/home/philipp/lede/feeds/packages/libs/glib2' time: package/feeds/packages/glib2/compile#0.97#0.33#1.14 package/Makefile:111: recipe for target 'package/feeds/packages/glib2/compile' failed make[1]: *** [package/feeds/packages/glib2/compile] Error 2 make[1]: Leaving directory '/home/philipp/lede' /home/philipp/lede/include/toplevel.mk:233: recipe for target 'package/glib2/compile' failed make: *** [package/glib2/compile] Error 2 That seems to be an invocation of Meson/CreateNativeFile, defined in feeds/packages/devel/meson/meson.mk, where $(MESON_DIR)/openwrt-cross.txt.in has never been installed. MESON_DIR is $(STAGING_DIR_HOSTPKG)/lib/meson, but staging_dir/hostpkg/lib/meson doesn’t exist. Where is this supposed to be created? It's created by the meson host package, see devel/meson/Makefile. Sounds like your build dirs are borked, try `make dirclean`? Do I need to do anything explicit to get meson to build and install a host version? Of course not. -Philip I need to be able to get back to building packages, but I’m dead in my tracks. Any guidance appreciated. Thanks, -Philip ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
