[PATCH] openssl: bump to 1.1.1h
This is a bug-fix release. Patches were refreshed.
Signed-off-by: Eneas U de Queiroz
--
Run-tested on mvebu/WRT3200ACM using nginx and uhttpd.
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
RE: [RFC PATCH] ath79: remove model name from LED labels
> -Original Message- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] > On Behalf Of Adrian Schmutzler > Sent: Samstag, 26. September 2020 18:25 > To: openwrt-devel@lists.openwrt.org > Subject: [RFC PATCH] ath79: remove model name from LED labels > > Currently, we request LED labels in OpenWrt to follow the scheme > > modelname:color:function > > However, specifying the modelname at the beginning is actually > entirely useless for the devices we support in OpenWrt. On the > contrary, having this part actually introduces inconvenience in > several aspects: I've added the missing 01_leds changes, ramips targets and a few minor things and pushed everything to a PR here: https://github.com/openwrt/openwrt/pull/3464 Best Adrian openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH] build, imagebuilder: Do not require compilers
The buildroot and SDK both require the compilers (gcc, g++) to be
installed on the host system, however the ImageBuilder uses precompiled
binaries.
This patch changes the prerequirements checks to skip the checking for
the compilers if running as ImageBuilder. A similar change has been
made for libncurses-dev in 4a1a58a3e2d2.
Signed-off-by: Sven Roederer
---
include/prereq-build.mk | 4
1 file changed, 4 insertions(+)
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 4637c6ca50..f67a01299e 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -26,6 +26,7 @@ $(eval $(call TestHostCommand,proper-umask, \
Please build with umask 022 - other values produce broken packages, \
umask | grep -xE 0?0[012][012]))
+ifndef IB
$(eval $(call SetupHostCommand,gcc, \
Please install the GNU C Compiler (gcc) 4.8 or later, \
$(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \
@@ -37,7 +38,9 @@ $(eval $(call TestHostCommand,working-gcc, \
it appears to be broken, \
echo 'int main(int argc, char **argv) { return 0; }' | \
gcc -x c -o $(TMP_DIR)/a.out -))
+endif
+ifndef IB
$(eval $(call SetupHostCommand,g++, \
Please install the GNU C++ Compiler (g++) 4.8 or later, \
$(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \
@@ -50,6 +53,7 @@ $(eval $(call TestHostCommand,working-g++, \
echo 'int main(int argc, char **argv) { return 0; }' | \
g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \
$(TMP_DIR)/a.out))
+endif
ifndef IB
$(eval $(call TestHostCommand,ncurses, \
--
2.20.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[no subject]
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- Branch: refs/heads/master Home: https://github.com/sdwalker/sdwalker.github.io Commit: aee9e7bea5ea722b638dfce41e9413f5de356ac0 https://github.com/sdwalker/sdwalker.github.io/commit/aee9e7bea5ea722b638dfce41e9413f5de356ac0 Author: Stephen Walker Date: 2020-09-27 (Sun, 27 Sep 2020) Changed paths: M uscan/index-18.06.html M uscan/index-19.07.html M uscan/index.html Log Message: --- This week's update --- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: Meson files missing breaking build
> 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? -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
Re: Meson files missing breaking build
> 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`? Did that. Can someone else confirm that they are able to build x86_64 on Ubuntu 18.02? > >> 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
Building on macOS with Xcode 12, clang 12
Can anyone please add support for building on macOS with Xcode 12?
Starting with a fresh clone, the build process of some host tools like bc fails
due to incorrect detection by autoconf:
For example, with Xcode 12 the build for bc fails because of the following line
in config.h.
When building with Xcode 11 this line is commented out and everything compiles
correctly.
#define ptrdiff_t size_t
The current workaround for building OpenWRT on macOS is to rename the
/Applications/Xcode.app and copy Xcode 11 in its place.
Making all in bc
make[6]: Entering directory '/Volumes/test/openwrt/build_dir/host/bc-1.06.95/bc’
…
In file included from string.c:31:
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/12.0.0/include/stddef.h:35:26:
error: typedef redefinition with different types ('long' vs '__darwin_size_t'
(aka 'unsigned long'))
typedef __PTRDIFF_TYPE__ ptrdiff_t;
^
../config.h:121:19: note: expanded from macro 'ptrdiff_t'
#define ptrdiff_t size_t
^
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sys/_types/_size_t.h:31:32:
note: previous definition is here
typedef __darwin_size_tsize_t;
If anyone knows the maintainer of autoconf, please add them to this e-mail!
Georgi Valkov
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
json-c: Embed RPATH on macOS to prevent error in ucert: dyld: Library not loaded: libjson-c.5.dylib
Hello Felix! Can you please review and commit this patch? There is also a link to the pull-request below. json-c: Embed RPATH on macOS to prevent error in ucert: dyld: Library not loaded: libjson-c.5.dylib https://github.com/openwrt/openwrt/pull/3391 https://bugs.openwrt.org/index.php?do=details_id=3328 --- .../patches/002-Embed-RPATH-on-macOS.patch| 20 +++ 1 file changed, 20 insertions(+) create mode 100644 package/libs/libjson-c/patches/002-Embed-RPATH-on-macOS.patch diff --git a/package/libs/libjson-c/patches/002-Embed-RPATH-on-macOS.patch b/package/libs/libjson-c/patches/002-Embed-RPATH-on-macOS.patch new file mode 100644 index 00..352f3407e1 --- /dev/null +++ b/package/libs/libjson-c/patches/002-Embed-RPATH-on-macOS.patch @@ -0,0 +1,20 @@ +Index: json-c-0.14/CMakeLists.txt +=== +--- json-c-0.14.orig/CMakeLists.txt json-c-0.14/CMakeLists.txt +@@ -2,6 +2,15 @@ + # specially true in old embedded systems (OpenWRT and friends) where CMake isn't necessarily upgraded. + cmake_minimum_required(VERSION 2.8) + ++# Embed RPATH on macOS ++if(POLICY CMP0042) ++ cmake_policy(SET CMP0042 NEW) ++endif() ++ ++if(POLICY CMP0068) ++ cmake_policy(SET CMP0068 NEW) ++endif() ++ + if(POLICY CMP0048) + cmake_policy(SET CMP0048 NEW) + endif() -- 2.24.3 (Apple Git-128) By the way, do you know someone who can add support for building on macOS with Xcode 12? Starting with a fresh clone, the build process of some host tools like bc fails due to incorrect detection by autoconf. The current workaround is to rename /Applications/Xcode.app and copy Xcode 11 in its place. I will create a separate e-mail for that. Do you know who is the maintainer of autoconf? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH] ath79: switch to kernel loader for ar9344 CPE/WBS
Now that firmware partitions starting with an ELF kernel loader can be
split automatically, move the TP-Link ar9344-based CPE and WBS devices
from an OKLI loader to a plain kernel loader.
This reduces the size of the device images a bit (2kB for initramfs and
sysupgrade). More importantly it takes away the requirement to
periodically resize the kernel partition to allow for larger kernels.
Note that the firmware size in tplink-safeloader.c is one erase block
smaller than the one in the DTSI, due to some runtime space reclamation
happening on these devices.
Also rebases tplink-eap2x5 on the new tplink-safeloader-elf base device.
Signed-off-by: Sander Vanheule
---
I've build tested this patch for all affected devices, but I cannot test
these new images on the CPE/WBS devices as I do not have these. Any
volunteer willing to test this patch on their device would be welcome to
do so.
target/linux/ath79/dts/ar9344_tplink_cpe.dtsi | 15 +
target/linux/ath79/image/common-tp-link.mk| 8 ++---
target/linux/ath79/image/generic-tp-link.mk | 27 +++
tools/firmware-utils/Makefile | 2 +-
tools/firmware-utils/src/tplink-safeloader.c | 33 +++
5 files changed, 27 insertions(+), 58 deletions(-)
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
index 044f6c5c19..27c85a8491 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
@@ -63,22 +63,9 @@
};
partition@4 {
+ compatible = "openwrt,elf";
label = "firmware";
reg = <0x04 0x78>;
-
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition@0 {
- label = "kernel";
- reg = <0x00 0x30>;
- };
-
- partition@30 {
- label = "rootfs";
- reg = <0x30 0x48>;
- };
};
partition@7c {
diff --git a/target/linux/ath79/image/common-tp-link.mk
b/target/linux/ath79/image/common-tp-link.mk
index 0b7b0e1935..7ce71811bb 100644
--- a/target/linux/ath79/image/common-tp-link.mk
+++ b/target/linux/ath79/image/common-tp-link.mk
@@ -84,13 +84,9 @@ define Device/tplink-safeloader-uimage
KERNEL_INITRAMFS := $$(KERNEL)
endef
-define Device/tplink-safeloader-okli
+define Device/tplink-safeloader-elf
$(Device/tplink-safeloader)
LOADER_TYPE := elf
- LOADER_FLASH_OFFS := 0x43000
- COMPILE := loader-$(1).elf
- COMPILE/loader-$(1).elf := loader-okli-compile
- KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | \
- loader-okli $(1) 12288
+ KERNEL := kernel-bin | append-dtb | lzma | loader-kernel
KERNEL_INITRAMFS := $$(KERNEL)
endef
diff --git a/target/linux/ath79/image/generic-tp-link.mk
b/target/linux/ath79/image/generic-tp-link.mk
index 22d1ac8a9e..3a066c1fd6 100644
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -247,7 +247,7 @@ endef
TARGET_DEVICES += tplink_archer-d7b-v1
define Device/tplink_cpe210-v1
- $(Device/tplink-safeloader-okli)
+ $(Device/tplink-safeloader-elf)
SOC := ar9344
IMAGE_SIZE := 7680k
DEVICE_MODEL := CPE210
@@ -285,7 +285,7 @@ endef
TARGET_DEVICES += tplink_cpe210-v3
define Device/tplink_cpe220-v2
- $(Device/tplink-safeloader-okli)
+ $(Device/tplink-safeloader-elf)
SOC := ar9344
IMAGE_SIZE := 7680k
DEVICE_MODEL := CPE220
@@ -308,7 +308,7 @@ endef
TARGET_DEVICES += tplink_cpe220-v3
define Device/tplink_cpe510-v1
- $(Device/tplink-safeloader-okli)
+ $(Device/tplink-safeloader-elf)
SOC := ar9344
IMAGE_SIZE := 7680k
DEVICE_MODEL := CPE510
@@ -320,7 +320,7 @@ endef
TARGET_DEVICES += tplink_cpe510-v1
define Device/tplink_cpe510-v2
- $(Device/tplink-safeloader-okli)
+ $(Device/tplink-safeloader-elf)
SOC := ar9344
IMAGE_SIZE := 7680k
DEVICE_MODEL := CPE510
@@ -332,7 +332,7 @@ endef
TARGET_DEVICES += tplink_cpe510-v2
define Device/tplink_cpe510-v3
- $(Device/tplink-safeloader-okli)
+ $(Device/tplink-safeloader-elf)
SOC := ar9344
IMAGE_SIZE := 7680k
DEVICE_MODEL := CPE510
@@ -343,7 +343,7 @@ endef
TARGET_DEVICES += tplink_cpe510-v3
define Device/tplink_cpe610-v1
- $(Device/tplink-safeloader-okli)
+ $(Device/tplink-safeloader-elf)
SOC := ar9344
IMAGE_SIZE := 7680k
DEVICE_MODEL := CPE610
@@ -353,7 +353,7 @@ endef
TARGET_DEVICES += tplink_cpe610-v1
define Device/tplink_cpe610-v2
- $(Device/tplink-safeloader-okli)
Re: Meson files missing breaking build
On Sat, Sep 26, 2020 at 11:13 PM 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`? Since I was CC'd... The issue is in his build environment. None of the buildbots have any issues. No other user does either. > > > > > 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
Re: Meson files missing breaking build
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`? 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
