[PATCH] README: add download section

[Paul Spooren]

The *Firmware Selector* was build to simplify users finding suitable
images for their devices. Let's give it more visibility so unleashing
your home router becomes an easier thing.

Signed-off-by: Paul Spooren 
---
This is a cross post[1] but since it's quite a public change I want it
to have some visibility.

[1]: https://github.com/openwrt/openwrt/pull/4527

 README.md | 12 
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index bf17544ed4..a1a1ead2cb 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,18 @@ full customization, to use the device in ways never 
envisioned.
 
 Sunshine!
 
+## Download
+
+Built firmware images are available for many architectures and come with a
+package selection to be used as WiFi home router. To quickly find a factory
+image usable to migrate from a vendor stock firmware to OpenWrt, try the
+*Firmware Selector*.
+
+* [OpenWrt Firmware Selector](https://firmware-selector.openwrt.org/)
+
+If your device is supported, please follow the **Info** link to see install
+instructions or consult the support resources listed below.
+
 ## Development
 
 To build your own firmware you need a GNU/Linux, BSD or MacOSX system (case
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] base-files: make os-release symbolic link absolute

[Paul Spooren]

On 9/9/21 19:53, Florian Eckert wrote:

* resolv.conf -> /tmp/resolv.conf
* /tmp/TZmtab -> /proc/mounts

For consistency, this should also apply to `/usr/lib/os-release`.


Is there any other reason than consistency to change this?


Yes, I have to elaborate on that.
I have a small script that boots the system into a called it "sandbox" 
mode.
If I do not save the sandbox config changes the system boots with old 
configuration.
This means that the changes to the configurations under /etc/ are not 
permanently saved, because I put a tmpfs over the /etc/.


For this to work, however, I have to copy the data somewhere else 
beforehand and then mount it.


mkdir -p /tmp/permetc
mount --bind /etc /tmp/permetc
mount -t tmpfs -o size="3M" none /etc
cp -r /tmp/permetc/* /etc

If you already run such script, can't you hard link os-release anyway?


Now I can configure the system as I need it. If I make a mistake, I 
can reboot the system and the old configuration will be reloaded.


So if I want to check what has changed (sandbox config vs. bootup 
config).

I display a diff with the command

diff -Naur /etc/permetc/ /etc

The problem now is that the file "../usr/lib/os-release" is always 
shown as not existing, because it is a relative path and the file 
under /tmp/permetc/../usr/lib/os-release/ does not exist.



I prefer relative links because they also work when the file system is
accessed by the build system like Paul said.


But if that is the case, could we not write the data into the target 
file under /usr/lib/os-release and not into the linked file?

This would make such simple changes possible.
The normal case should be that the folder structure should look like 
on the target system just as we need it.


By the way, this is the only link that is relative (at least on my 
system) all others are absolute.




Looking at this I'm wondering if there is a good reason to have the file 
twice? From my understanding there should be only a single place to have 
this file?




___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] base-files: reduce `mkdir` and `sed` calls

[Paul Spooren]

There is no need in calling `mkdir` every single time, instead give it
multiple folders at once.

Also there is no need to create a folder (i.e. /etc/) after a sub folder
of /etc/ was already created.

Additionally there is no need to call the `sed` version replacement
script multiple times with partly the same files.

Signed-off-by: Paul Spooren 
---
 package/base-files/Makefile | 42 ++---
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 58ad08c63a..af5c0e6b00 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -150,37 +150,38 @@ define Package/base-files/install
 
$(VERSION_SED_SCRIPT) \
$(1)/etc/banner \
+   $(1)/etc/device_info \
+   $(1)/etc/openwrt_release \
$(1)/etc/openwrt_version \
$(1)/usr/lib/os-release
 
-   $(VERSION_SED_SCRIPT) \
-   $(1)/etc/openwrt_release \
-   $(1)/etc/device_info \
-   $(1)/usr/lib/os-release
 
$(SED) "s#%PATH%#$(TARGET_INIT_PATH)#g" \
$(1)/sbin/hotplug-call \
$(1)/etc/preinit \
$(1)/etc/profile
 
-   mkdir -p $(1)/CONTROL
-   mkdir -p $(1)/dev
-   mkdir -p $(1)/etc/config
-   mkdir -p $(1)/etc/crontabs
-   mkdir -p $(1)/etc/rc.d
-   mkdir -p $(1)/overlay
-   mkdir -p $(1)/lib/firmware
+   mkdir -p \
+   $(1)/CONTROL \
+   $(1)/dev \
+   $(1)/etc/config \
+   $(1)/etc/crontabs \
+   $(1)/etc/rc.d \
+   $(1)/overlay \
+   $(1)/lib/firmware \
+   $(1)/mnt \
+   $(1)/proc \
+   $(1)/tmp \
+   $(1)/usr/lib \
+   $(1)/usr/bin \
+   $(1)/sys \
+   $(1)/www \
+   $(1)/root
+
+   $(LN) /proc/mounts $(1)/etc/mtab
$(if $(LIB_SUFFIX),-$(LN) lib $(1)/lib$(LIB_SUFFIX))
-   mkdir -p $(1)/mnt
-   mkdir -p $(1)/proc
-   mkdir -p $(1)/tmp
-   mkdir -p $(1)/usr/lib
$(if $(LIB_SUFFIX),-$(LN) lib $(1)/usr/lib$(LIB_SUFFIX))
-   mkdir -p $(1)/usr/bin
-   mkdir -p $(1)/sys
-   mkdir -p $(1)/www
-   mkdir -p $(1)/root
-   $(LN) /proc/mounts $(1)/etc/mtab
+
 ifneq ($(CONFIG_TARGET_ROOTFS_PERSIST_VAR),y)
rm -f $(1)/var
$(LN) tmp $(1)/var
@@ -188,7 +189,6 @@ else
mkdir -p $(1)/var
$(LN) /tmp/run $(1)/var/run
 endif
-   mkdir -p $(1)/etc
$(LN) /tmp/resolv.conf /tmp/TZ /tmp/localtime $(1)/etc/
 
chmod 0600 $(1)/etc/shadow
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] base-files: make os-release symbolic link absolute

[Paul Spooren]

On 9/8/21 02:50, Florian Eckert wrote:

The file `/etc/os-release` is currently a relative link to
`../usr/lib/os-release`.

The follwing links on my `/etc` are also absolute:
* localtime -> /tmp/localtime
* resolv.conf -> /tmp/resolv.conf
* /tmp/TZmtab -> /proc/mounts

For consistency, this should also apply to `/usr/lib/os-release`.

Signed-off-by: Florian Eckert 
---
Did you check that none of the build scripts try to access this file? In 
case they do, they'd fail since an absolute path wouldn't exists on the 
building host system.

  package/base-files/files/etc/os-release | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/base-files/files/etc/os-release 
b/package/base-files/files/etc/os-release
index c4c75b419c..d98fc7a7ac 12
--- a/package/base-files/files/etc/os-release
+++ b/package/base-files/files/etc/os-release
@@ -1 +1 @@
-../usr/lib/os-release
\ No newline at end of file
+/usr/lib/os-release
\ No newline at end of file


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH v2] x86: switch to 5.10 kernel

[Paul Spooren]

On 9/7/21 11:39, Paul Spooren wrote:

Seems to be working fine in Docker containers.

Signed-off-by: Paul Spooren 
---

Of course I mean QEMU not Docker (which uses the host Kernel)

v2: Remove redundant TESTING_PATCHVER

  target/linux/x86/Makefile | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 0ab322d8bc..fbad527e0a 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -10,8 +10,7 @@ BOARDNAME:=x86
  FEATURES:=squashfs ext4 vdi vmdk pcmcia targz fpu boot-part rootfs-part
  SUBTARGETS:=generic legacy geode 64
  
-KERNEL_PATCHVER:=5.4

-KERNEL_TESTING_PATCHVER:=5.10
+KERNEL_PATCHVER:=5.10
  
  KERNELNAME:=bzImage
  


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH v2] x86: switch to 5.10 kernel

[Paul Spooren]

Seems to be working fine in Docker containers.

Signed-off-by: Paul Spooren 
---
v2: Remove redundant TESTING_PATCHVER

 target/linux/x86/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 0ab322d8bc..fbad527e0a 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -10,8 +10,7 @@ BOARDNAME:=x86
 FEATURES:=squashfs ext4 vdi vmdk pcmcia targz fpu boot-part rootfs-part
 SUBTARGETS:=generic legacy geode 64
 
-KERNEL_PATCHVER:=5.4
-KERNEL_TESTING_PATCHVER:=5.10
+KERNEL_PATCHVER:=5.10
 
 KERNELNAME:=bzImage
 
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] mvebu/kernel: promote 5.10 to stable

[Paul Spooren]

On 9/7/21 11:31, Rui Salvaterra wrote:

Hi, Daniel,

On Tue, 7 Sept 2021 at 22:09, Daniel Golle  wrote:

I'd remove the KERNEL_TESTING_PATCHVER line then until we add 5.14 or
whatever it's going to be.

Sure, I didn't know what the usual procedure was, so I just mimicked aparcar. ;)
V2 coming up.


This seems to be an ongoing thing, some add it and some remove it, I'm 
happy to make this consistent:


* Remove KERNEL_TESTING_PATCHVER when promoting

or

* Set KERNEL_{,TESTING}_PATCHVER to the same value until a new testing 
Kernel is added


I'd prefer the former since it removes the feature flag 
`testing-kernel`, therefore I'd update my patch and we should do that 
for all further *Kernel promotions*. Objections?



___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] x86: switch to 5.10 kernel

[Paul Spooren]

Seems to be working fine in Docker containers.

Signed-off-by: Paul Spooren 
---
 target/linux/x86/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 0ab322d8bc..14cfba777c 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -10,7 +10,7 @@ BOARDNAME:=x86
 FEATURES:=squashfs ext4 vdi vmdk pcmcia targz fpu boot-part rootfs-part
 SUBTARGETS:=generic legacy geode 64
 
-KERNEL_PATCHVER:=5.4
+KERNEL_PATCHVER:=5.10
 KERNEL_TESTING_PATCHVER:=5.10
 
 KERNELNAME:=bzImage
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] build: Config-images: build ISO, VMDK and VDI for x86

[Paul Spooren]

These images are of interested for some cloud/VM people, build them by
default when running the buildbot.

Signed-off-by: Paul Spooren 
---
 config/Config-images.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/Config-images.in b/config/Config-images.in
index 92720fb84d..ea50d7d399 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -259,18 +259,21 @@ menu "Target Images"
bool "Build LiveCD image (ISO)"
depends on TARGET_x86
depends on GRUB_IMAGES || GRUB_EFI_IMAGES
+   default BUILDBOT
 
config VDI_IMAGES
bool "Build VirtualBox image files (VDI)"
depends on TARGET_x86
depends on GRUB_IMAGES || GRUB_EFI_IMAGES
select PACKAGE_kmod-e1000
+   default BUILDBOT
 
config VMDK_IMAGES
bool "Build VMware image files (VMDK)"
depends on TARGET_x86
depends on GRUB_IMAGES || GRUB_EFI_IMAGES
select PACKAGE_kmod-e1000
+   default BUILDBOT
 
config TARGET_IMAGES_GZIP
bool "GZip images"
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH buildbot] Bump to latest Buildbot release 3.3.0

[Paul Spooren]

See changelog:
https://github.com/buildbot/buildbot/releases/tag/v3.3.0

Signed-off-by: Paul Spooren 
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07a0407..5b6f6eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  BUILDBOT_VERSION: 3.2.0
+  BUILDBOT_VERSION: 3.3.0
   OPENWRT_VERSION: $CI_COMMIT_SHORT_SHA
 
 include:
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH buildbot 2/2] docker: install `mkisofs` to worker container

[Paul Spooren]

x86 targets allow the creation of ISO images, however this is not
possible because the `mkisofs` is missing. Install it.

Signed-off-by: Paul Spooren 
---
 docker/buildworker/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/buildworker/Dockerfile b/docker/buildworker/Dockerfile
index fdbae1f..049d20f 100644
--- a/docker/buildworker/Dockerfile
+++ b/docker/buildworker/Dockerfile
@@ -25,6 +25,7 @@ RUN \
libelf-dev \
libncurses5-dev \
locales \
+   mkisofs \
pv \
pwgen \
python \
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH buildbot 1/2] docker: sort installed packages alphabetically

[Paul Spooren]

Signed-off-by: Paul Spooren 
---
 docker/buildmaster/Dockerfile |  2 +-
 docker/buildworker/Dockerfile | 12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker/buildmaster/Dockerfile b/docker/buildmaster/Dockerfile
index 28dc9ed..b2134ce 100644
--- a/docker/buildmaster/Dockerfile
+++ b/docker/buildmaster/Dockerfile
@@ -19,10 +19,10 @@ RUN \
gosu \
libncurses5-dev \
locales \
-   signify-openbsd \
pv \
pwgen \
python3-pip \
+   signify-openbsd \
wget && \
apt-get clean && \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias 
en_US.UTF-8
diff --git a/docker/buildworker/Dockerfile b/docker/buildworker/Dockerfile
index 9be02ec..fdbae1f 100644
--- a/docker/buildworker/Dockerfile
+++ b/docker/buildworker/Dockerfile
@@ -21,20 +21,20 @@ RUN \
gcc-multilib \
git-core \
gosu \
-   libncurses5-dev \
-   libelf-dev \
libdw-dev \
+   libelf-dev \
+   libncurses5-dev \
locales \
-   rsync \
-   signify-openbsd \
-   subversion \
-   swig \
pv \
pwgen \
python \
python3 \
python3-pip \
qemu-utils \
+   rsync \
+   signify-openbsd \
+   subversion \
+   swig \
unzip \
wget && \
apt-get clean && \
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] dropbear: add config options for agent-forwarding support

[Paul Spooren]

On 7/24/21 8:08 PM, Hauke Mehrtens wrote:

On 7/16/21 12:44 AM, Sven Roederer wrote:
* SSH agent forwarding might cause security issues, locally and on 
the jump

   machine (https://defn.io/2019/04/12/ssh-forwarding/). So allow to
   completely disabling it.
* separate options for client and server
* keep it enabled by default



How much bigger will the dropbear binary get with these options?

Will dropbear always activate agent forwarding for the client connection?

I think it is no security problem when the server always uses agent 
forwarding, but when the client forwards the agent to every host it 
could get a problem.
If I read Svens patch correctly it's only about disabling things 
explicitly which are "possible" by default. Forwarding only happens when 
using `ssh -A`. Therefore this patch shouldn't add any size at all.



Signed-of-by: Sven Roederer 
---
  package/network/services/dropbear/Config.in | 9 +
  package/network/services/dropbear/Makefile  | 5 -
  2 files changed, 13 insertions(+), 1 deletion(-)



___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: Enabling Wi-Fi on First boot

[Paul Spooren]

I'd argue that it merely completes the OEM options. If that isn't a valid 
argument we should drop all of VERSIONOPTs since it can be all modified 
via /files.

--



Jul 7, 2021 21:39:59 Petr Štetiar :


Paul Spooren  [2021-07-07 15:10:59]:

Hi,

Feel free to check this out, it's not ready yet but should give an 
idea:


https://github.com/openwrt/openwrt/pull/4349

More sophisticated setups are not supported this is merely used to 
allow


are not supported for *now*, but once folks notice this, they'll of 
course try

to extend this for their use case and thus bloat it further. BTW why is
wireless so special? Why there is not default config for example for 
LTE or

ppoe as well?

Sorry, but I don't like this, as you're solving just one very simple 
use case,

adding stuff which would never be enabled in official images. IIUC this
feature can't be used from imagebuilder either, thus folks would need 
to
always build the images from scratch, which seems to be overkill just 
for

tweaking config. Or am I missing something?

The standard way for doing such tweaks is `files` directory, which has 
clumsy
UX. If you want to improve that UX, you're probably looking for 
something like
ucentral[1] is doing. Having some default image configuration specified 
in
ucode/YAML (would probably need YAML support added into ucode first) 
and then
generate those uci configs into respective `files` directory. BTW this 
should
be external project, no need to have this in the tree, it would make 
CI/QA

much easier etc.

1. 
https://github.com/blogic/ucentral-schema/blob/main/renderer/templates/interface/ssid.uc


-- ynezz


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: Enabling Wi-Fi on First boot

[Paul Spooren]

On 7/5/21 8:45 PM, Enrico Mioso wrote:

Hello all!!

I would like to know your opinion on a topic I know has already been 
discussed: enabling Wi-Fi on first boot.
I would very very much like to see this feature present in OpenWRt: 
because I find myself in a scenario where plugging an Ethernet cable 
after a fresh sysupgrade without keeping settings (due a a major 
upgrade or just to "start clean") could be impractical.


From an implementation perspective, I don't think this feature needs 
to be present on images we build with builtbots, nor official images 
at all. It may be a config option a user can check when self-building 
his/her images.
This would allow us to relax the security settings for the moment 
being, and discuss and plan them later on. It seems to me there is the 
general desire for having such a feature.


Thanks a lot!

Enrico


Feel free to check this out, it's not ready yet but should give an idea:

https://github.com/openwrt/openwrt/pull/4349



___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: Enabling Wi-Fi on First boot

[Paul Spooren]

On 7/5/21 8:45 PM, Enrico Mioso wrote:

Hello all!!

I would like to know your opinion on a topic I know has already been 
discussed: enabling Wi-Fi on first boot.
I would very very much like to see this feature present in OpenWRt: 
because I find myself in a scenario where plugging an Ethernet cable 
after a fresh sysupgrade without keeping settings (due a a major 
upgrade or just to "start clean") could be impractical.
I think you can add uci-default scripts to enable it or do you want a 
config option during build time?


From an implementation perspective, I don't think this feature needs 
to be present on images we build with builtbots, nor official images 
at all. It may be a config option a user can check when self-building 
his/her images.
This would allow us to relax the security settings for the moment 
being, and discuss and plan them later on. It seems to me there is the 
general desire for having such a feature.


Thanks a lot!

Enrico

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH 19.07 4/4] treewide: mark selected packages nonshared

[Paul Spooren]

On 7/1/21 9:51 AM, Petr Štetiar wrote:

Paul Spooren  [2021-07-01 07:45:02]:


+++ b/package/libs/libjson-c/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
   PKG_NAME:=json-c
   PKG_VERSION:=0.12.1
-PKG_RELEASE:=3.1
+PKG_RELEASE:=3.2

I've never seen a non integer release, is there a special reason for this?

package/base-files/Makefile:PKG_RELEASE:=204.4
package/boot/uboot-envtools/Makefile:PKG_RELEASE:=3.1
package/libs/libjson-c/Makefile:PKG_RELEASE:=3.2
package/libs/libpcap/Makefile:PKG_RELEASE:=2.1
package/network/services/dnsmasq/Makefile:PKG_RELEASE:=16.3
package/network/utils/iproute2/Makefile:PKG_RELEASE:=2.1

Thanks for the lookup.

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] uqmi: Move to community packages repo

[Paul Spooren]

On 7/1/21 9:50 AM, Arjun AK wrote:

Signed-off-by: Arjun AK 
---


Could you please add a brief commit message describing why this package 
isn't needed in core?


I'm all for moving it, don't get me wrong, we just try to have commit 
messages everywhere to keep context over time.



  package/network/utils/uqmi/Makefile   |  48 --
  .../utils/uqmi/files/lib/netifd/proto/qmi.sh  | 471 --
  2 files changed, 519 deletions(-)
  delete mode 100644 package/network/utils/uqmi/Makefile
  delete mode 100755 package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh

diff --git a/package/network/utils/uqmi/Makefile 
b/package/network/utils/uqmi/Makefile
deleted file mode 100644
index 53ca67230b..00
--- a/package/network/utils/uqmi/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=uqmi
-PKG_RELEASE:=3
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(PROJECT_GIT)/project/uqmi.git
-PKG_SOURCE_DATE:=2020-11-22
-PKG_SOURCE_VERSION:=0a19b5b77140465c29e2afa7d611fe93abc9672f
-PKG_MIRROR_HASH:=0a6641f8e167efd21d464b0b2aeb1fec5f974dddcdb8822fbd5d7190d0b741b4
-PKG_MAINTAINER:=Matti Laakso 
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=
-
-PKG_FLAGS:=nonshared
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/uqmi
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=WWAN
-  DEPENDS:=+libubox +libblobmsg-json +kmod-usb-net +kmod-usb-net-qmi-wwan +wwan
-  TITLE:=Control utility for mobile broadband modems
-endef
-
-define Package/uqmi/description
-  uqmi is a command line tool for controlling mobile broadband modems using
-  the QMI-protocol.
-endef
-
-TARGET_CFLAGS += \
-   -I$(STAGING_DIR)/usr/include -ffunction-sections -fdata-sections
-
-TARGET_LDFLAGS += -Wl,--gc-sections
-
-CMAKE_OPTIONS += \
-   -DDEBUG=1
-
-define Package/uqmi/install
-   $(INSTALL_DIR) $(1)/sbin
-   $(INSTALL_BIN) $(PKG_BUILD_DIR)/uqmi $(1)/sbin/
-   $(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,uqmi))
diff --git a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh 
b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
deleted file mode 100755
index c0134f44dd..00
--- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
+++ /dev/null
@@ -1,471 +0,0 @@
-#!/bin/sh
-
-[ -n "$INCLUDE_ONLY" ] || {
-   . /lib/functions.sh
-   . ../netifd-proto.sh
-   init_proto "$@"
-}
-
-proto_qmi_init_config() {
-   available=1
-   no_device=1
-   proto_config_add_string "device:device"
-   proto_config_add_string apn
-   proto_config_add_string auth
-   proto_config_add_string username
-   proto_config_add_string password
-   proto_config_add_string pincode
-   proto_config_add_int delay
-   proto_config_add_string modes
-   proto_config_add_string pdptype
-   proto_config_add_int profile
-   proto_config_add_boolean dhcp
-   proto_config_add_boolean dhcpv6
-   proto_config_add_boolean autoconnect
-   proto_config_add_int plmn
-   proto_config_add_int timeout
-   proto_config_add_int mtu
-   proto_config_add_defaults
-}
-
-proto_qmi_setup() {
-   local interface="$1"
-   local dataformat connstat plmn_mode mcc mnc
-   local device apn auth username password pincode delay modes pdptype
-   local profile dhcp dhcpv6 autoconnect plmn timeout mtu 
$PROTO_DEFAULT_OPTIONS
-   local ip4table ip6table
-   local cid_4 pdh_4 cid_6 pdh_6
-   local ip_6 ip_prefix_length gateway_6 dns1_6 dns2_6
-
-   json_get_vars device apn auth username password pincode delay modes
-   json_get_vars pdptype profile dhcp dhcpv6 autoconnect plmn ip4table
-   json_get_vars ip6table timeout mtu $PROTO_DEFAULT_OPTIONS
-
-   [ "$timeout" = "" ] && timeout="10"
-
-   [ "$metric" = "" ] && metric="0"
-
-   [ -n "$ctl_device" ] && device=$ctl_device
-
-   [ -n "$device" ] || {
-   echo "No control device specified"
-   proto_notify_error "$interface" NO_DEVICE
-   proto_set_available "$interface" 0
-   return 1
-   }
-
-   [ -n "$delay" ] && sleep "$delay"
-
-   device="$(readlink -f $device)"
-   [ -c "$device" ] || {
-   echo "The specified control device does not exist"
-   proto_notify_error "$interface" NO_DEVICE
-   proto_set_available "$interface" 0
-   return 1
-   }
-
-   devname="$(basename "$device")"
-   devpath="$(readlink -f /sys/class/usbmisc/$devname/device/)"
-   ifname="$( ls "$devpath"/net )"
-   [ -n "$ifname" ] || {
-   echo "The interface could not be found."
-   proto_notify_error "$interface" NO_IFACE
-   proto_set_available "$interface" 0
-   return 1
-   }
-
-   [ -n "$mtu" ] && {
-   echo "Setting MTU to $mtu"
-   /sbin/ip link set dev $ifname mtu $mtu
-   }
-
-   echo "Waiting 

Re: [PATCH 19.07 4/4] treewide: mark selected packages nonshared

[Paul Spooren]

On 7/1/21 3:09 AM, Petr Štetiar wrote:

From: Hannu Nyman 

Mark uci, ubus, libubox, lua, libnl-tiny and libjson-c
as nonshared packages. This helps to keep coherent dependencies
if these ABI versioned packages are later updated.

Before this commit it is possible to get missing dependencies
in target-specific nonshared packages (like iwinfo) that depend
on these shared ABI versioned packages. If these are later updated
and rebuilt, only the new ABI version will be available for download,
while the target-specific packages in releases continue to depend on
the old ABI version.

After this commit the packages are built along the other nonshared
packages by the phase1 images buildbot and will be available at the
target/ download directories instead of packages/base dir. That will
help to keep a coherent set available.

Signed-off-by: Hannu Nyman 
Signed-off-by: Petr Štetiar  [backport]
(backported from commit 72cc44958ef4e0df1a152178514c92899d6a957a)
Signed-off-by: Petr Štetiar 
---
  package/libs/libjson-c/Makefile  | 3 ++-
  package/libs/libnl-tiny/Makefile | 4 +++-
  package/libs/libubox/Makefile| 4 +++-
  package/system/ubus/Makefile | 3 ++-
  package/system/uci/Makefile  | 3 ++-
  package/utils/lua/Makefile   | 3 ++-
  6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile
index 522de0698423..49e9d01a12a9 100644
--- a/package/libs/libjson-c/Makefile
+++ b/package/libs/libjson-c/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=json-c

  PKG_VERSION:=0.12.1
-PKG_RELEASE:=3.1
+PKG_RELEASE:=3.2

I've never seen a non integer release, is there a special reason for this?
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz

  PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
@@ -21,6 +21,7 @@ PKG_LICENSE:=MIT
  PKG_LICENSE_FILES:=COPYING
  PKG_CPE_ID:=cpe:/a:json-c_project:json-c
  
+PKG_FLAGS:=nonshared

  PKG_FIXUP:=autoreconf
  PKG_INSTALL:=1
  
diff --git a/package/libs/libnl-tiny/Makefile b/package/libs/libnl-tiny/Makefile

index cabbb084218f..79c3bdcb2eef 100644
--- a/package/libs/libnl-tiny/Makefile
+++ b/package/libs/libnl-tiny/Makefile
@@ -9,7 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=libnl-tiny

  PKG_VERSION:=0.1
-PKG_RELEASE:=5
+PKG_RELEASE:=6
+
+PKG_FLAGS:=nonshared
  
  PKG_LICENSE:=LGPL-2.1

  PKG_MAINTAINER:=Felix Fietkau 
diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index 49bf58374266..8f1ce50b5827 100644
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -1,7 +1,7 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=libubox

-PKG_RELEASE=1
+PKG_RELEASE=2
  
  PKG_SOURCE_PROTO:=git

  PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
@@ -10,6 +10,8 @@ PKG_SOURCE_DATE:=2020-05-25
  PKG_SOURCE_VERSION:=66195aee50424cbda0c2d858014e4cc58a2dc029
  CMAKE_INSTALL:=1
  
+PKG_FLAGS:=nonshared

+
  PKG_LICENSE:=ISC
  PKG_LICENSE_FILES:=
  
diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile

index 2c116ae6f852..f0833663a8a9 100644
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@@ -1,7 +1,7 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=ubus

-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE_PROTO:=git

  PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
@@ -13,6 +13,7 @@ CMAKE_INSTALL:=1
  
  PKG_LICENSE:=LGPL-2.1

  PKG_LICENSE_FILES:=
+PKG_FLAGS:=nonshared
  
  PKG_MAINTAINER:=Felix Fietkau 
  
diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile

index 903d4c50ca3a..2c75f270c078 100644
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@@ -9,7 +9,7 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=uci

-PKG_RELEASE:=4
+PKG_RELEASE:=5
  
  PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git

  PKG_SOURCE_PROTO:=git
@@ -23,6 +23,7 @@ PKG_LICENSE_FILES:=
  PKG_MAINTAINER:=Felix Fietkau 
  
  PKG_BUILD_PARALLEL:=0

+PKG_FLAGS:=nonshared
  
  include $(INCLUDE_DIR)/package.mk

  include $(INCLUDE_DIR)/cmake.mk
diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
index 077a60fbf3e8..73358c540714 100644
--- a/package/utils/lua/Makefile
+++ b/package/utils/lua/Makefile
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
  
  PKG_NAME:=lua

  PKG_VERSION:=5.1.5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

  PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
http://www.tecgraf.puc-rio.br/lua/ftp/
  PKG_HASH:=2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
  PKG_BUILD_PARALLEL:=1
+PKG_FLAGS:=nonshared
  
  PKG_LICENSE:=MIT

  PKG_LICENSE_FILES:=COPYRIGHT

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] x86: include kmod-fs-vfat by default in generic images

[Paul Spooren]

On 6/29/21 3:22 PM, Daniel Golle wrote:

As x86/64 and x86/generic may be using UEFI, mounting the FAT-32 /boot
is necessary in order not to loose configuration files accross
sysupgrades. Include kmod-fs-vfat by default to make sure /boot can
always be mounted.

Signed-off-by: Daniel Golle 
---

LGTM

  target/linux/x86/image/64.mk  | 2 +-
  target/linux/x86/image/generic.mk | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/x86/image/64.mk b/target/linux/x86/image/64.mk
index 9c9decbf79..d5033f932a 100644
--- a/target/linux/x86/image/64.mk
+++ b/target/linux/x86/image/64.mk
@@ -1,7 +1,7 @@
  define Device/generic
DEVICE_TITLE := Generic x86/64
DEVICE_PACKAGES += kmod-amazon-ena kmod-bnx2 kmod-e1000e kmod-e1000 \
-   kmod-forcedeth kmod-igb kmod-ixgbe kmod-amd-xgbe kmod-r8169
+   kmod-forcedeth kmod-igb kmod-ixgbe kmod-amd-xgbe kmod-r8169 kmod-fs-vfat
GRUB2_VARIANT := generic
  endef
  TARGET_DEVICES += generic
diff --git a/target/linux/x86/image/generic.mk 
b/target/linux/x86/image/generic.mk
index 8a23afef0a..81cccd30b0 100644
--- a/target/linux/x86/image/generic.mk
+++ b/target/linux/x86/image/generic.mk
@@ -2,7 +2,7 @@ define Device/generic
DEVICE_TITLE := Generic x86
DEVICE_PACKAGES += kmod-3c59x kmod-8139too kmod-e100 kmod-e1000 
kmod-natsemi \
kmod-ne2k-pci kmod-pcnet32 kmod-r8169 kmod-sis900 kmod-tg3 \
-   kmod-via-rhine kmod-via-velocity kmod-forcedeth
+   kmod-via-rhine kmod-via-velocity kmod-forcedeth kmod-fs-vfat
GRUB2_VARIANT := generic
  endef
  TARGET_DEVICES += generic


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] comgt: Move to community packages repo

[Paul Spooren]

On 6/28/21 9:53 AM, John Crispin wrote:


On 28.06.21 21:14, Paul Spooren wrote:
I'm in favor of this too but if it's a core feature (i.e. SIM card 
support) we should provide the package by default to, not? 


this should be explained in the wiki,
Agree, APU boards etc also need some extra packages to support SDcards 
and things. Let's do this.


    John


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] comgt: Move to community packages repo

[Paul Spooren]

On 6/28/21 8:53 AM, Piotr Dymacz wrote:

Hi John,

On 28.06.2021 20:32, John Crispin wrote:


On 28.06.21 19:26, Piotr Dymacz wrote:
I might be wrong here but I think we don't include packages from 
external feeds inside 'DEVICE_PACKAGES' (not sure/don't remember why). 


I am in favour of moving all none-core packages to the feeds. the
dependency should be removed and a note should be added to the wiki
indicating that if a release/snapshot image is installed an opkg call
shall be issued
I'm in favor of this too but if it's a core feature (i.e. SIM card 
support) we should provide the package by default to, not?


Sounds good to me, just wanted to warn about the existing dependency.



___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH v2] zram-swap: robustify mkswap/swapon/swapoff invocation

[Paul Spooren]

Hi,

On 6/21/21 9:54 PM, Rui Salvaterra wrote:

Instead of assuming /sbin contains the correct BusyBox symlinks, directly invoke
the busybox executable. The required utilities are guaranteed to be present,
since the zram-swap package selects them. Additionally, don't assume busybox
resides in /bin, rely on PATH to find it.

While at it, update the copyright year, use SPDX and switch to AUTORELEASE.

Signed-off-by: Rui Salvaterra 
---
v2: update the copyright year, use SPDX and switch to AUTORELEASE.

  package/system/zram-swap/Makefile|  9 ++
  package/system/zram-swap/files/zram.init | 39 ++--
  2 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/package/system/zram-swap/Makefile 
b/package/system/zram-swap/Makefile
index 80f87fcdff..d0d1baddd1 100644
--- a/package/system/zram-swap/Makefile
+++ b/package/system/zram-swap/Makefile
@@ -1,14 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
  #
-# Copyright (C) 2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+# Copyright (C) 2013-2021 OpenWrt.org
  
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=zram-swap

-PKG_RELEASE:=8
+PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
  
diff --git a/package/system/zram-swap/files/zram.init b/package/system/zram-swap/files/zram.init

index d97e85efa5..4c645d6013 100755
--- a/package/system/zram-swap/files/zram.init
+++ b/package/system/zram-swap/files/zram.init
@@ -25,31 +25,6 @@ zram_getsize()   # in megabytes
fi
  }
  
-zram_applicable()

-{
-   local zram_dev="$1"
-
-   [ -e "$zram_dev" ] || {
-   logger -s -t zram_applicable -p daemon.crit "[ERROR] device 
'$zram_dev' not found"
-   return 1
-   }
-
-   [ -x /sbin/mkswap ] || {
-   logger -s -t zram_applicable -p daemon.err "[ERROR] 'BusyBox mkswap' 
not installed"
-   return 1
-   }
-
-   [ -x /sbin/swapon ] || {
-   logger -s -t zram_applicable -p daemon.err "[ERROR] 'BusyBox swapon' 
not installed"
-   return 1
-   }
-
-   [ -x /sbin/swapoff ] || {
-   logger -s -t zram_applicable -p daemon.err "[ERROR] 'BusyBox 
swapoff' not installed"
-   return 1
-   }
-}
-
  zram_dev()
  {
local idx="$1"
@@ -160,8 +135,14 @@ start()
return 1
fi
  
-	local zram_size="$( zram_getsize )"

local zram_dev="$( zram_getdev )"
+
+   [ -e "$zram_dev" ] || {
+   logger -s -t zram_applicable -p daemon.crit "[ERROR] device 
'$zram_dev' not found"
+   return 1
+   }
+
+   local zram_size="$( zram_getsize )"
zram_applicable "$zram_dev" || return 1

This line should be removed, too.

local zram_priority="$( uci -q get system.@system[0].zram_priority )"
zram_priority=${zram_priority:+-p $zram_priority}
@@ -171,8 +152,8 @@ start()
zram_reset "$zram_dev" "enforcing defaults"
zram_comp_algo "$zram_dev"
echo $(( $zram_size * 1024 * 1024 )) >"/sys/block/$( basename "$zram_dev" 
)/disksize"
-   /sbin/mkswap "$zram_dev"
-   /sbin/swapon -d $zram_priority "$zram_dev"
+   busybox mkswap "$zram_dev"
+   busybox swapon -d $zram_priority "$zram_dev"
  }
  
  stop()

@@ -181,7 +162,7 @@ stop()
  
  	for zram_dev in $( grep zram /proc/swaps |awk '{print $1}' ); do {

logger -s -t zram_stop -p daemon.debug "deactivate swap 
$zram_dev"
-   /sbin/swapoff "$zram_dev" && zram_reset "$zram_dev" "claiming memory 
back"
+   busybox swapoff "$zram_dev" && zram_reset "$zram_dev" "claiming 
memory back"
local dev_index="$( echo $zram_dev | grep -o "[0-9]*$" )"
if [ $dev_index -ne 0 ]; then
logger -s -t zram_stop -p daemon.debug "removing zram 
$zram_dev"


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] base-files: fix zoneinfo support

[Paul Spooren]

On 6/23/21 1:14 PM, Rosen Penev wrote:

On Wed, Jun 23, 2021 at 3:40 PM Paul Spooren  wrote:

Hi,

if I'm not mistaken this patch doesn't quite do the trick: You removed
the removal of /tmp/TZ which seem to be preferred by `hwclock`, meaning
even if $zonename (aka $zname) is found, /tmp/TZ is still there. As a
result both /tmp/TZ and /tmp/localtime exists both, allowing the user no
longer to change the timezone at all, even when typing the "correct"
entry (i.e. Pacific/Port_Moresby).

Ummm. This script is the one that creates /tmp/TZ in the first place.
/tmp/TZ is an openwrt hack that is used when there are no zoneinfo
files. After this patch, it gets created only if they are missing.

Please send a v2 removing the /tmp/TZ file again iff $zonename exists.

There's no point in removing that which is not present.

- Firstbooting device creates /tmp/TZ since it defaults to UTC

- Change zonename configuration in /etc/config/system

- Run /etc/init.d/system restart

- Time stays the same since /tmp/TZ isn't removed (just /tmp/localtime 
appeared next to it)


A reboot actually fixes this since /tmp/ is mounted in memory but 
OpenWrt is all about uptime.


Sunshine,
Paul


On 4/9/21 2:22 PM, Rosen Penev wrote:

The system init script currently sets /tmp/localinfo when zoneinfo is
populated. However, zoneinfo has spaces in it whereas the actual files
have _ instead of spaces. This made the if condition never return true.

Example failure when removing the if condition:

/tmp/localtime -> /usr/share/zoneinfo/America/Los Angeles

This file does not exist. America/Los_Angeles does.

Signed-off-by: Rosen Penev 
---
   this should be backported to 21.02 and 19.07 as the issue is also
   present there. This was tested on 19.07.
   package/base-files/files/etc/init.d/system | 10 +++---
   1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/package/base-files/files/etc/init.d/system 
b/package/base-files/files/etc/init.d/system
index 08cf86b97f..b1fc154cec 100755
--- a/package/base-files/files/etc/init.d/system
+++ b/package/base-files/files/etc/init.d/system
@@ -22,9 +22,13 @@ system_config() {

   echo "$hostname" > /proc/sys/kernel/hostname
   [ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n 
$conloglevel} ${buffersize:+-s $buffersize}
- echo "$timezone" > /tmp/TZ
- [ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && \
- ln -sf "/usr/share/zoneinfo/$zonename" /tmp/localtime && rm -f 
/tmp/TZ
+ if [ -n "$zonename" ]; then
+ local zname=$(echo "$zonename" | tr ' ' _)
+ [ -f "/usr/share/zoneinfo/$zname" ] && \
+ ln -sf "/usr/share/zoneinfo/$zname" /tmp/localtime
+ else
+ echo "$timezone" > /tmp/TZ
+ fi

   # apply timezone to kernel
   hwclock -u --systz


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] base-files: fix zoneinfo support

[Paul Spooren]

Hi,

if I'm not mistaken this patch doesn't quite do the trick: You removed 
the removal of /tmp/TZ which seem to be preferred by `hwclock`, meaning 
even if $zonename (aka $zname) is found, /tmp/TZ is still there. As a 
result both /tmp/TZ and /tmp/localtime exists both, allowing the user no 
longer to change the timezone at all, even when typing the "correct" 
entry (i.e. Pacific/Port_Moresby).


Please send a v2 removing the /tmp/TZ file again iff $zonename exists.

On 4/9/21 2:22 PM, Rosen Penev wrote:

The system init script currently sets /tmp/localinfo when zoneinfo is
populated. However, zoneinfo has spaces in it whereas the actual files
have _ instead of spaces. This made the if condition never return true.

Example failure when removing the if condition:

/tmp/localtime -> /usr/share/zoneinfo/America/Los Angeles

This file does not exist. America/Los_Angeles does.

Signed-off-by: Rosen Penev 
---
  this should be backported to 21.02 and 19.07 as the issue is also
  present there. This was tested on 19.07.
  package/base-files/files/etc/init.d/system | 10 +++---
  1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/package/base-files/files/etc/init.d/system 
b/package/base-files/files/etc/init.d/system
index 08cf86b97f..b1fc154cec 100755
--- a/package/base-files/files/etc/init.d/system
+++ b/package/base-files/files/etc/init.d/system
@@ -22,9 +22,13 @@ system_config() {
  
  	echo "$hostname" > /proc/sys/kernel/hostname

[ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n 
$conloglevel} ${buffersize:+-s $buffersize}
-   echo "$timezone" > /tmp/TZ
-   [ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && \
-   ln -sf "/usr/share/zoneinfo/$zonename" /tmp/localtime && rm -f 
/tmp/TZ
+   if [ -n "$zonename" ]; then
+   local zname=$(echo "$zonename" | tr ' ' _)
+   [ -f "/usr/share/zoneinfo/$zname" ] && \
+   ln -sf "/usr/share/zoneinfo/$zname" /tmp/localtime
+   else
+   echo "$timezone" > /tmp/TZ
+   fi
  
  	# apply timezone to kernel

hwclock -u --systz


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] dante: move to packages.git

[Paul Spooren]

Rather than maintaining it in core, move it to packages.git where it's
maintained by a community.

CC: Jo-Philipp Wich 
Signed-off-by: Paul Spooren 
---
A new maintainer stepped up and like to take over the work over at
packages.git, see https://github.com/openwrt/packages/pull/15939

 package/network/utils/dante/Makefile  | 118 --
 .../dante/patches/200-fix-RTLD_NEXT.patch |  36 --
 .../210-deactivate-sched_setscheduler.patch   |  53 
 3 files changed, 207 deletions(-)
 delete mode 100644 package/network/utils/dante/Makefile
 delete mode 100644 package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch
 delete mode 100644 
package/network/utils/dante/patches/210-deactivate-sched_setscheduler.patch

diff --git a/package/network/utils/dante/Makefile 
b/package/network/utils/dante/Makefile
deleted file mode 100644
index 15bd6d2afc..00
--- a/package/network/utils/dante/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dante
-PKG_VERSION:=1.4.1
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.inet.no/dante/files/
-PKG_HASH:=b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53
-
-PKG_MAINTAINER:=Jo-Philipp Wich 
-PKG_LICENSE:=BSD-4-Clause
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_ARGS += \
-   --without-upnp \
-   --without-pam \
-   --disable-libwrap
-
-CONFIGURE_VARS += \
-   ac_cv_search_pam_start="" \
-   ac_cv_func_sched_setscheduler=no
-
-define Build/InstallDev
-   $(INSTALL_DIR) $(1)/usr/include
-   $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-   $(INSTALL_DIR) $(1)/usr/lib
-   $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so*,la} $(1)/usr/lib/
-endef
-
-
-define Package/dante/default
-  TITLE:=Dante SOCKS
-  URL:=http://www.inet.no/dante/
-endef
-
-define Package/dante/default/description
-Dante is a circuit-level firewall/proxy that can be used to provide convenient
-and secure network connectivity, requiring only that the server Dante runs on
-has external network connectivity. Dante is used daily by Fortune 100 companies
-and large international organizations, either as a standard SOCKS server or as
-a "reverse proxy".
-endef
-
-define Package/libsocks
-  $(call Package/dante/default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= Library
-  ABI_VERSION:=0
-endef
-
-define Package/libsocks/description
-$(call Package/dante/default/description)
-This package provides the shared libsocks library.
-endef
-
-define Package/libsocks/install
-   $(INSTALL_DIR) $(1)/usr/lib
-   $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsocks.so.* $(1)/usr/lib/
-endef
-
-
-define Package/sockd
-  $(call Package/dante/default)
-  SUBMENU:=Web Servers/Proxies
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE+= Daemon
-endef
-
-define Package/sockd/description
-$(call Package/dante/default/description)
-This package provides the Dante sockd daemon.
-endef
-
-define Package/sockd/install
-   $(INSTALL_DIR) $(1)/usr/sbin
-   $(CP) $(PKG_INSTALL_DIR)/usr/sbin/sockd $(1)/usr/sbin/
-endef
-
-
-define Package/socksify
-  $(call Package/dante/default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE+= Client
-endef
-
-define Package/socksify/description
-$(call Package/dante/default/description)
-This package provides the Dante socksify client.
-endef
-
-define Package/socksify/install
-   $(INSTALL_DIR) $(1)/usr/bin
-   $(CP) $(PKG_INSTALL_DIR)/usr/bin/socksify $(1)/usr/bin/
-
-   $(INSTALL_DIR) $(1)/usr/lib
-   $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdsocks.so* $(1)/usr/lib/
-endef
-
-
-$(eval $(call BuildPackage,libsocks))
-$(eval $(call BuildPackage,sockd))
-$(eval $(call BuildPackage,socksify))
diff --git a/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch 
b/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch
deleted file mode 100644
index 594a6f900b..00
--- a/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch
+++ /dev/null
@@ -1,36 +0,0 @@
 a/lib/address.c
-+++ b/lib/address.c
-@@ -48,11 +48,12 @@
- 
- #include "upnp.h"
- 
--#ifndef __USE_GNU
--#define __USE_GNU /* XXX for RTLD_NEXT on Linux */
--#endif /* !__USE_GNU */
- #include 
- 
-+#ifndef RTLD_NEXT
-+#define RTLD_NEXT  ((void *) -1l)
-+#endif
-+
- static const char rcsid[] =
- "$Id: address.c,v 1.288.4.4 2014/08/15 18:16:40 karls Exp $";
- 
 a/dlib/interposition.c
-+++ b/dlib/interposition.c
-@@ -93,11 +93,12 @@ write$NOCANCEL(HAVE_PROT_WRITE_1, HAVE_P
- 
- #endif /* HAVE_DARWIN */
- 
--#ifndef __USE_GNU
--#define __USE_GNU /* XXX for RTLD_NEXT on Linux */
--#endif /* !__USE_GNU */
- #include 
- 
-+#ifndef RTLD_NEXT
-+#define RTLD_NEXT  ((void *

Re: [PATCH 1/3] base-files: failsafe: Fix IP configuration

[Paul Spooren]

Not sure but is this PR related?

"base-files: bring up vlan interface too #2734"

https://github.com/openwrt/openwrt/pull/2734

On 6/19/21 8:36 AM, Hauke Mehrtens wrote:

Adapt the preinit_config_board() to the board.json network changes. It
now looks for the device and the ports variables to configure the LAN
network.

This works with swconfig configurations.

Fixes: FS#3866
Fixes: d42640e389a8 ("base-files: use "ports" array in board.json network for 
bridges")
Signed-off-by: Hauke Mehrtens 
---
  .../files/lib/preinit/10_indicate_preinit  | 18 --
  1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit 
b/package/base-files/files/lib/preinit/10_indicate_preinit
index 3c5992979016..ae9fcfecc89e 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -72,28 +72,34 @@ preinit_config_board() {
  
  	json_select network

json_select "lan"
-   json_get_vars ifname
+   json_get_vars device
+   json_get_values ports ports
json_select ..
json_select ..
  
-	[ -n "$ifname" ] || return

+   [ -n "$device" -o -n "$ports" ] || return
+
+   # swconfig uses $device and DSA uses ports
+   [ -z "$ports" ] && {
+   ports="$device"
+   }
  
  	# only use the first one

-   ifname=${ifname%% *}
+   ports=${ports%% *}
  
  	if [ -x /sbin/swconfig ]; then

# configure the switch, if present
  
  		json_get_keys keys switch

for key in $keys; do
-   preinit_config_switch $key $ifname
+   preinit_config_switch $key $ports
done
else
# trim any vlan ids
-   ifname=${ifname%\.*}
+   ports=${ports%\.*}
fi
  
-	pi_ifname=$ifname

+   pi_ifname=$ports
  
  	preinit_ip_config $pi_ifname

  }


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH 3/3] squashfskit4: Remove obsolete package

[Paul Spooren]

With the introduction of `squashfs-tools-ng` the `squashfskit4` fork is
no longer required.

Signed-off-by: Paul Spooren 
---
 tools/squashfskit4/Makefile   | 41 --
 .../patches/0001-fix-version.sh.patch | 21 -
 ...002-fix-build-failure-against-gcc-10.patch | 43 ---
 .../patches/0010-portability.patch| 37 
 4 files changed, 142 deletions(-)
 delete mode 100644 tools/squashfskit4/Makefile
 delete mode 100644 tools/squashfskit4/patches/0001-fix-version.sh.patch
 delete mode 100644 
tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch
 delete mode 100644 tools/squashfskit4/patches/0010-portability.patch

diff --git a/tools/squashfskit4/Makefile b/tools/squashfskit4/Makefile
deleted file mode 100644
index 9ed10ecef9..00
--- a/tools/squashfskit4/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=squashfskit4
-PKG_VERSION:=4.14
-PKG_RELEASE:=2
-PKG_SOURCE:=squashfskit-v$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://github.com/squashfskit/squashfskit/releases/download/v$(PKG_VERSION)/
-PKG_HASH:=5761aaa3aedc4f7112b708367d891c9abdc1ffea972e3fe47923ddba23984d95
-
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/squashfskit-v$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/host-build.mk
-
-define Host/Compile
-   +$(HOST_MAKE_VARS) \
-   $(MAKE) -C $(HOST_BUILD_DIR)/squashfs-tools \
-   XZ_SUPPORT=1 \
-   LZMA_XZ_SUPPORT=1 \
-   XATTR_SUPPORT=1 \
-   LZMA_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \
-   EXTRA_CFLAGS="-I$(STAGING_DIR_HOST)/include" \
-   mksquashfs unsquashfs
-endef
-
-define Host/Install
-   $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs 
$(STAGING_DIR_HOST)/bin/mksquashfs4
-   $(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs 
$(STAGING_DIR_HOST)/bin/unsquashfs4
-endef
-
-define Host/Clean
-   rm -f $(STAGING_DIR_HOST)/bin/mksquashfs4
-   rm -f $(STAGING_DIR_HOST)/bin/unsquashfs4
-endef
-
-$(eval $(call HostBuild))
diff --git a/tools/squashfskit4/patches/0001-fix-version.sh.patch 
b/tools/squashfskit4/patches/0001-fix-version.sh.patch
deleted file mode 100644
index 5f0894bc17..00
--- a/tools/squashfskit4/patches/0001-fix-version.sh.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 a/squashfs-tools/version.sh
-+++ b/squashfs-tools/version.sh
-@@ -27,13 +27,11 @@ if [ -z "$OUTPUT" ] ; then
- fi
- 
- our_date() {
--case $(uname) in
--NetBSD|OpenBSD|DragonFly|FreeBSD|Darwin)
--date -r "$1" "$2"
--;;
--*)
--date -d "@$1" "$2"
--esac
-+  if date --version 2>&1 | grep -q "GNU coreutils"; then
-+  date -d "@$1" "$2"
-+  else
-+  date -r "$1" "$2"
-+  fi
- }
- 
- try_version() {
diff --git 
a/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch 
b/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch
deleted file mode 100644
index 46c6a5ea0f..00
--- a/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich 
-Date: Sun, 26 Jan 2020 18:35:13 +
-Subject: [PATCH] squashfs-tools: fix build failure against gcc-10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-cc ... -o mksquashfs
-ld: read_fs.o:(.bss+0x0):
-  multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first 
defined here
-ld: read_fs.o:(.bss+0x8):
-  multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first 
defined here
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-by: Toralf Förster
-Bug: https://bugs.gentoo.org/706456
-Signed-off-by: Sergei Trofimovich 

- squashfs-tools/mksquashfs.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
-index 1beefef7..b6503063 100644
 a/squashfs-tools/mksquashfs.h
-+++ b/squashfs-tools/mksquashfs.h
-@@ -143,7 +143,7 @@ struct append_file {
- #endif
- 
- extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
--struct cache *bwriter_buffer, *fwriter_buffer;
-+extern struct cache *bwriter_buffer, *fwriter_buffer;
- extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
-   *to_frag, *locked_fragment, *to_process_frag;
- extern struct append_file **file_mapping;
d

[PATCH 2/3] build,squashfs: switch to squashfs-tools-ng

[Paul Spooren]

Let the newly added `squasfs-tools-ng` handle the squashfs file
creation.

Signed-off-by: Paul Spooren 
---
 include/image.mk | 23 ---
 tools/Makefile   |  6 +++---
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/include/image.mk b/include/image.mk
index a7473abe68..cf43ff1180 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -76,12 +76,13 @@ SQUASHFS_BLOCKSIZE := $(CONFIG_TARGET_SQUASHFS_BLOCK_SIZE)k
 SQUASHFSOPT := -b $(SQUASHFS_BLOCKSIZE)
 SQUASHFSOPT += -p '/dev d 755 0 0' -p '/dev/console c 600 0 0 5 1'
 SQUASHFSCOMP := gzip
-LZMA_XZ_OPTIONS := -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2
+LZMA_XZ_OPTIONS := -X lc=0,lp=2,pb=2
+BCJ_FILTER:=extreme
 ifeq ($(CONFIG_SQUASHFS_XZ),y)
   ifneq ($(filter arm x86 powerpc sparc,$(LINUX_KARCH)),)
-BCJ_FILTER:=-Xbcj $(LINUX_KARCH)
+BCJ_FILTER:=,$(LINUX_KARCH)
   endif
-  SQUASHFSCOMP := xz $(LZMA_XZ_OPTIONS) $(BCJ_FILTER)
+  SQUASHFSCOMP := xz $(LZMA_XZ_OPTIONS)$(BCJ_FILTER)
 endif
 
 JFFS2_BLOCKSIZE ?= 64k 128k
@@ -226,10 +227,18 @@ $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call 
Image/mkfs/jffs2/template,$(S
 $(eval $(foreach S,$(NAND_BLOCKSIZE),$(call 
Image/mkfs/jffs2-nand/template,$(S
 
 define Image/mkfs/squashfs-common
-   $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
-   -nopad -noappend -root-owned \
-   -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
-   -processors 1
+   echo 'dir /dev 0755 0 0' > $@.squashfs.packfile; \
+   echo 'nod /dev/console 0600 0 0 c 5 1' >> $@.squashfs.packfile; \
+   echo 'glob / * * *' >> $@.squashfs.packfile; \
+   $(STAGING_DIR_HOST)/bin/gensquashfs \
+   --block-size $(SQUASHFS_BLOCKSIZE) \
+   --all-root \
+   --force \
+   --compressor $(SQUASHFSCOMP) \
+   --defaults uid=0,gid=0,mtime=0 \
+   --pack-dir $(call mkfs_target_dir,$(1)) \
+   --pack-file $@.squashfs.packfile \
+   $@
 endef
 
 ifeq ($(CONFIG_TARGET_ROOTFS_SECURITY_LABELS),y)
diff --git a/tools/Makefile b/tools/Makefile
index a48aa80db3..2f0c090ee9 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -25,7 +25,7 @@ tools-y += autoconf autoconf-archive automake bc bison cmake 
cpio dosfstools
 tools-y += e2fsprogs fakeroot findutils firmware-utils flex gengetopt
 tools-y += libressl libtool lzma m4 make-ext4fs missing-macros mkimage
 tools-y += mklibs mm-macros mtd-utils mtools ninja padjffs2 patch-image
-tools-y += patchelf pkgconf quilt squashfskit4 sstrip xxd zip zlib zstd
+tools-y += patchelf pkgconf quilt squashfs-tools-ng sstrip xxd zip zlib zstd
 tools-$(BUILD_B43_TOOLS) += b43-tools
 tools-$(BUILD_ISL) += isl
 tools-$(BUILD_TOOLCHAIN) += expat gmp mpc mpfr
@@ -69,12 +69,12 @@ $(curdir)/patchelf/compile := $(curdir)/libtool/compile
 $(curdir)/quilt/compile := $(curdir)/autoconf/compile 
$(curdir)/findutils/compile
 $(curdir)/sdcc/compile := $(curdir)/bison/compile
 $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
-$(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
+$(curdir)/squashfs-tools-ng/compile := $(curdir)/autoconf/compile 
$(curdir)/xz/compile $(curdir)/zlib/compile
 $(curdir)/zlib/compile := $(curdir)/cmake/compile
 $(curdir)/zstd/compile := $(curdir)/cmake/compile
 
 ifneq ($(HOST_OS),Linux)
-  $(curdir)/squashfskit4/compile += $(curdir)/coreutils/compile
+  $(curdir)/squashfs-tools-ng/compile += $(curdir)/coreutils/compile
   tools-y += coreutils
 endif
 
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH 0/3] [RFT] Replace squashfskit with squashfs-tools-ng

[Paul Spooren]

Hi all,

Some long time ago I created a PR[1] on GitHub to replace our (stalled)
fork of squashfs-tools (called squashfskit[2]) with a reimplementation
called squashfs-tools-ng[3].

The main developer was thankfully very helpful in the process of
integrating squashfs-tools-ng into the OpenWrt build system.

I'm cross posting this here to get a bit more visibility and possible
testing. Please let me know if you run into any issues, I haven't tried
any exotic corner cases yet (due to lack of devices).

Best,
Paul

[1]: https://github.com/openwrt/openwrt/pull/2916
[2]: https://github.com/squashfskit/squashfskit
[3]: https://github.com/AgentD/squashfs-tools-ng


Paul Spooren (3):
  squashfs-tools-ng: add package
  build,squashfs: switch to squashfs-tools-ng
  squashfskit4: Remove obsolete package

 include/image.mk  | 23 +++---
 tools/Makefile|  6 +--
 tools/squashfs-tools-ng/Makefile  | 26 +++
 tools/squashfskit4/Makefile   | 41 --
 .../patches/0001-fix-version.sh.patch | 21 -
 ...002-fix-build-failure-against-gcc-10.patch | 43 ---
 .../patches/0010-portability.patch| 37 
 7 files changed, 45 insertions(+), 152 deletions(-)
 create mode 100644 tools/squashfs-tools-ng/Makefile
 delete mode 100644 tools/squashfskit4/Makefile
 delete mode 100644 tools/squashfskit4/patches/0001-fix-version.sh.patch
 delete mode 100644 
tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch
 delete mode 100644 tools/squashfskit4/patches/0010-portability.patch

-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH 1/3] squashfs-tools-ng: add package

[Paul Spooren]

The `squashfs-tools-ng` is a reimplementation of `squashfs-tools` of
which a fork called `squashfskit` is currently used withn OpenWrt.

Signed-off-by: Paul Spooren 
---
 tools/squashfs-tools-ng/Makefile | 26 ++
 1 file changed, 26 insertions(+)
 create mode 100644 tools/squashfs-tools-ng/Makefile

diff --git a/tools/squashfs-tools-ng/Makefile b/tools/squashfs-tools-ng/Makefile
new file mode 100644
index 00..67b856ae28
--- /dev/null
+++ b/tools/squashfs-tools-ng/Makefile
@@ -0,0 +1,26 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=squashfs-tools-ng
+PKG_VERSION:=1.1.1
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/AgentD/squashfs-tools-ng/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=e4d3dfc9f354267c65bf2dd7e483ad23a148d49b3946e2ab3918e1fbd69015c1
+
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Install
+   $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
+   $(INSTALL_BIN) $(HOST_BUILD_DIR)/.libs/gensquashfs 
$(STAGING_DIR_HOST)/bin/gensquashfs
+   $(INSTALL_BIN) $(HOST_BUILD_DIR)/.libs/tar2sqfs 
$(STAGING_DIR_HOST)/bin/tar2sqfs
+   $(INSTALL_BIN) $(HOST_BUILD_DIR)/.libs/rdsquashfs 
$(STAGING_DIR_HOST)/bin/rdsquashfs
+   $(INSTALL_BIN) $(HOST_BUILD_DIR)/.libs/libsquashfs* 
$(STAGING_DIR_HOST)/lib/
+endef
+
+define Host/Clean
+endef
+
+$(eval $(call HostBuild))
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] treewide: call check-size before append-metadata

[Paul Spooren]

On 6/20/21 6:56 AM, Adrian Schmutzler wrote:

sysupgrade metadata is not flashed to the device, so check-size
should be called _before_ adding metadata to the image.

While at it, do some obvious wrapping improvements.

Signed-off-by: Adrian Schmutzler 
---


Acked-by: Paul Spooren 

I'm wondering if the size is somewhere checked on devices, meaning a 
sysupgrade is refused because the "total" size (incl. metadata) is 
bigger than what the image would allow. In that case something like 
`stat` shouldn't be used for the file size but e.g. another field in the 
metadata?



  target/linux/ath79/image/Makefile   |  2 +-
  target/linux/ath79/image/common-mikrotik.mk |  2 +-
  target/linux/ath79/image/common-netgear.mk  | 10 +++---
  target/linux/ath79/image/common-tp-link.mk  |  5 ++-
  target/linux/ath79/image/generic-tp-link.mk |  2 +-
  target/linux/ath79/image/generic-ubnt.mk|  4 +--
  target/linux/ath79/image/generic.mk | 36 +
  target/linux/ath79/image/nand.mk|  3 +-
  target/linux/ath79/image/tiny.mk|  3 +-
  target/linux/ipq40xx/image/generic.mk   |  8 ++---
  target/linux/ipq40xx/image/mikrotik.mk  |  2 +-
  target/linux/ipq806x/image/Makefile |  2 +-
  target/linux/lantiq/image/Makefile  |  4 +--
  target/linux/lantiq/image/ar9.mk|  6 ++--
  target/linux/lantiq/image/tp-link.mk|  2 +-
  target/linux/lantiq/image/vr9.mk|  2 +-
  target/linux/ramips/image/Makefile  |  6 ++--
  target/linux/ramips/image/common-tp-link.mk | 10 +++---
  target/linux/ramips/image/mt7620.mk | 10 +++---
  target/linux/ramips/image/mt7621.mk | 10 +++---
  target/linux/ramips/image/rt305x.mk |  6 ++--
  target/linux/ramips/image/rt3883.mk |  2 +-
  target/linux/realtek/image/Makefile |  2 +-
  23 files changed, 64 insertions(+), 75 deletions(-)

diff --git a/target/linux/ath79/image/Makefile 
b/target/linux/ath79/image/Makefile
index aa8665fbb2..aee4ddf963 100644
--- a/target/linux/ath79/image/Makefile
+++ b/target/linux/ath79/image/Makefile
@@ -81,7 +81,7 @@ define Device/Default
COMPILE :=
IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin = append-kernel | pad-to (BLOCKSIZE) | \
-   append-rootfs | pad-rootfs | append-metadata | check-size
+   append-rootfs | pad-rootfs | check-size | append-metadata
  endef
  
  include $(SUBTARGET).mk

diff --git a/target/linux/ath79/image/common-mikrotik.mk 
b/target/linux/ath79/image/common-mikrotik.mk
index 6e739f2d85..5f5fa7899a 100644
--- a/target/linux/ath79/image/common-mikrotik.mk
+++ b/target/linux/ath79/image/common-mikrotik.mk
@@ -9,7 +9,7 @@ define Device/mikrotik_nor
$(Device/mikrotik)
IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 -e | \
pad-to (BLOCKSIZE) | append-rootfs | pad-rootfs | \
-   append-metadata | check-size
+   check-size | append-metadata
  endef
  
  define Device/mikrotik_nand

diff --git a/target/linux/ath79/image/common-netgear.mk 
b/target/linux/ath79/image/common-netgear.mk
index 8a74fdc0c9..5a61caf1f6 100644
--- a/target/linux/ath79/image/common-netgear.mk
+++ b/target/linux/ath79/image/common-netgear.mk
@@ -32,10 +32,8 @@ define Device/netgear_generic
KERNEL := kernel-bin | append-dtb | lzma -d20 | uImage lzma
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | uImage lzma
IMAGES += factory.img
-  IMAGE/default := append-kernel | pad-to (BLOCKSIZE) | netgear-squashfs | 
\
-   append-rootfs | pad-rootfs
-  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \
-   check-size
-  IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | \
-   check-size
+  IMAGE/default := append-kernel | pad-to (BLOCKSIZE) | \
+   netgear-squashfs | append-rootfs | pad-rootfs
+  IMAGE/sysupgrade.bin := $$(IMAGE/default) | check-size | append-metadata
+  IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size
  endef
diff --git a/target/linux/ath79/image/common-tp-link.mk 
b/target/linux/ath79/image/common-tp-link.mk
index 0b7b0e1935..f1d5614aa7 100644
--- a/target/linux/ath79/image/common-tp-link.mk
+++ b/target/linux/ath79/image/common-tp-link.mk
@@ -22,8 +22,7 @@ define Device/tplink-v2
TPLINK_HVERSION := 3
KERNEL := kernel-bin | append-dtb | lzma
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | tplink-v2-header
-  IMAGE/sysupgrade.bin := tplink-v2-image -s | append-metadata | \
-   check-size
+  IMAGE/sysupgrade.bin := tplink-v2-image -s | check-size | append-metadata
  endef
  
  define Device/tplink-nolzma

@@ -74,7 +73,7 @@ define Device/tplink-safeloader
KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O
KERNEL_INITRAMFS := $$(KERNEL)
IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
-   append-metadata | check-size
+   check-size | append-metadata
IMAGE/factory.bin := append-rootf

[PATCH] build: create profiles.json per default

[Paul Spooren]

The file is a info file just like config.buildinfo, feeds.buildinfo and
version.buildinfo. It bundles these and more information in a machine
readable way.

This commit enables the creation of profiles.json by default and not
only for buildbots. By doing so it follow the behaviour of the
ImageBuilder which always create the file and also increases the files
visibility for downstream projects.

Signed-off-by: Paul Spooren 
---
 config/Config-build.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/Config-build.in b/config/Config-build.in
index 342859b7c0..f0e1aaa695 100644
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -21,7 +21,7 @@ menu "Global build settings"
 
config JSON_OVERVIEW_IMAGE_INFO
bool "Create JSON info file overview per target"
-   default BUILDBOT
+   default y
help
  Create a JSON info file called profiles.json in the target
  directory containing machine readable list of built profiles
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: Should ubus be marked as target-specific "nonshared"? (broken 21.02 rc2 imagebuilder)

[Paul Spooren]

Sounds good to me. Do you mind investigate what other packages are affected

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH 21.02 v2] build/json: fix IMAGE_PREFIX and DEVICE_PACKAGES

[Paul Spooren]

These two variables were missing in the definition of
DEFAULT_DEVICE_VARS which caused them to contain wrong values, messing
up the resulting JSON files.

This patch adds the two variables IMAGE_PREFIX and DEVICE_PACKAGES to
DEFAULT_DEVICE_VARS.

Suggested-by: Baptiste Jonglez 
Signed-off-by: Paul Spooren 
---
v2:
  Fix multiple typos, sorry for the hasty patch.

 include/image.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/image.mk b/include/image.mk
index 8cfd2155f3..b6e8ab3c84 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -419,7 +419,7 @@ DEFAULT_DEVICE_VARS := \
   DEVICE_DTS_CONFIG DEVICE_DTS_DIR DEVICE_FDT_NUM SOC BOARD_NAME \
   UIMAGE_MAGIC UIMAGE_NAME \
   SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \
-  UBOOT_PATH IMAGE_SIZE \
+  IMAGE_PREFIX DEVICE_PACKAGES UBOOT_PATH IMAGE_SIZE \
   DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \
   DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \
   DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] build/json: fix DEVICE_PACKAGES

[Paul Spooren]

The variable was missing in the definition of DEFAULT_DEVICE_VARS which
caused it to contain wrong values, messing up the resulting JSON files.

This patch adds the variable DEVICE_PACKAGES to DEFAULT_DEVICE_VARS.

Suggested-by: Baptiste Jonglez 
Signed-off-by: Paul Spooren 
---
 include/image.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/image.mk b/include/image.mk
index afefc2bb0b..c8b33a40bb 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -431,7 +431,7 @@ DEFAULT_DEVICE_VARS := \
   DEVICE_IMG_PREFIX SOC BOARD_NAME UIMAGE_MAGIC UIMAGE_NAME \
   SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \
   UBOOT_PATH IMAGE_SIZE \
-  DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \
+  DEVICE_PACKAGES DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \
   DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \
   DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \
   DEVICE_ALT1_VENDOR DEVICE_ALT1_MODEL DEVICE_ALT1_VARIANT \
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH 21.02] build/json: fix IMAGE_PREFIX and DEFAULT_PACKAGES

[Paul Spooren]

These two variables where missing in the definition of
DEFAULT_DEVICE_VARS which caused them to contain wrong values, messing
up the resuling JSON files.

This patch add the two variables IMAGE_PREFIX and DEFAULT_PACKAGES to
DEFAULT_DEVICE_VARS.

Suggested-by: Baptiste Jonglez 
Signed-off-by: Paul Spooren 
---
 include/image.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/image.mk b/include/image.mk
index 8cfd2155f3..b6e8ab3c84 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -419,7 +419,7 @@ DEFAULT_DEVICE_VARS := \
   DEVICE_DTS_CONFIG DEVICE_DTS_DIR DEVICE_FDT_NUM SOC BOARD_NAME \
   UIMAGE_MAGIC UIMAGE_NAME \
   SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \
-  UBOOT_PATH IMAGE_SIZE \
+  IMAGE_PREFIX DEVICE_PACKAGES UBOOT_PATH IMAGE_SIZE \
   DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \
   DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \
   DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] busybox: mention SRV support in help message

[Paul Spooren]

The SRV was added some time ago and should be mentioned in the short
help message to avoid confusion about missing features.

Signed-off-by: Paul Spooren 
---
Already sent to upstream:
http://lists.busybox.net/pipermail/busybox/2021-May/088849.html

 .../540-nslookup-mention-QUERY_TYPE-SRV.patch | 30 +++
 1 file changed, 30 insertions(+)
 create mode 100644 
package/utils/busybox/patches/540-nslookup-mention-QUERY_TYPE-SRV.patch

diff --git 
a/package/utils/busybox/patches/540-nslookup-mention-QUERY_TYPE-SRV.patch 
b/package/utils/busybox/patches/540-nslookup-mention-QUERY_TYPE-SRV.patch
new file mode 100644
index 00..ac9afa34ef
--- /dev/null
+++ b/package/utils/busybox/patches/540-nslookup-mention-QUERY_TYPE-SRV.patch
@@ -0,0 +1,30 @@
+From a0136f24f788e8bfc4ab74a647b27e115a25d9fb Mon Sep 17 00:00:00 2001
+From: Paul Spooren 
+Date: Wed, 19 May 2021 00:55:21 +0200
+Subject: [PATCH] nslookup: mention QUERY_TYPE SRV
+
+SRV lookups are supported since "6b4960155 nslookup: implement support
+for SRV records" and should therefore be mentioned as a possible
+QUERY_TYPE in the help message.
+
+Signed-off-by: Paul Spooren 
+---
+ networking/nslookup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/networking/nslookup.c b/networking/nslookup.c
+index dda22de0e..2ae8d391c 100644
+--- a/networking/nslookup.c
 b/networking/nslookup.c
+@@ -25,7 +25,7 @@
+ //usage:#define nslookup_full_usage "\n\n"
+ //usage:   "Query DNS about HOST"
+ //usage:   IF_FEATURE_NSLOOKUP_BIG("\n")
+-//usage:   IF_FEATURE_NSLOOKUP_BIG("\nQUERY_TYPE: 
soa,ns,a,"IF_FEATURE_IPV6(",")"cname,mx,txt,ptr,any")
++//usage:   IF_FEATURE_NSLOOKUP_BIG("\nQUERY_TYPE: 
soa,ns,a,"IF_FEATURE_IPV6(",")"cname,mx,txt,ptr,srv,any")
+ //usage:#define nslookup_example_usage
+ //usage:   "$ nslookup localhost\n"
+ //usage:   "Server: default\n"
+-- 
+2.30.2
+
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: Flagship AX routers

[Paul Spooren]

Hi,

On 5/18/21 11:52 PM, Philip Prindeville wrote:

Hi all,

I noticed that there are several AX routers from TP-Link, Netgear, D-Link, etc. 
and some of them have even had OpenWRT ported to them.

Which of these various platforms has the most CPU/RAM/FLASH? A few are discussed, but I'm 
not seeing consensus on "the best one currently is this..."


I'm using both a Belkin RT3200 and a Linksys AX3200 (aka E8450), which 
are conveniently pretty much the same thing and I'm having a pretty good 
time. Would flash again.


Best,
Paul


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [RFC] OpenWrt within a Docker container

[Paul Spooren]

On 5/17/21 11:09 PM, Fernando Frediani wrote:

Hello

Certainly run /sbin/init or 'procd' to have *OpenWrt-like experience* 
is a better approach in my view.


So do you prefer to disable some services and make some init-scripts 
"container aware"?




Regards
Fernando


On 17/05/2021 15:39, Paul Spooren wrote:

Hello,

after some back and forth I'd like to request some more opinions on 
what kind of Docker containers to offer containing the OpenWrt 
rootfs. This is not about the SDK or ImageBuilder Docker containers.


tl;dr:

Should we ship `slim` containers only, running a OpenWrt shell (ash) 
and nothing more? Whoever wants services to run (e.g. ubus) should 
run additional containers and glue them together via mounts? Or 
should we run /sbin/init or `procd` to have a *OpenWrt-like 
experience*, with LuCI, ubusd and friends.


/tl;dr

Currently the `openwrt/rootfs` container is shipped with minimal 
modifications and starts `/sbin/init` as default action.


Running the container for e.g. LuCI development within a local shell 
results in the following output:


```
user@reactor:~$ docker run -it openwrt/rootfs
Failed to resize receive buffer: Operation not permitted
/etc/preinit: line 5: can't create 
/sys/devices/system/cpu/microcode/reload: Read-only file system

ip: RTNETLINK answers: Operation not permitted
Press the [f] key and hit [enter] to enter failsafe mode
Press the [1], [2], [3] or [4] key and hit [enter] to select the 
debug level

ip: can't send flush request: Operation not permitted
ip: SIOCSIFFLAGS: Operation not permitted
Please press Enter to activate this console.
--- %< ---
root@da3dfbdc5ae4:/#

```

Some init scripts fail due to missing privileges. The console input 
is only possible by using a patched /etc/inittab file and multiple 
services keep failing, most problematic the `network` service since 
it tries and fails in a fast loop to flush some interfaces.


A possible patch is available[1] which disables services obsolete 
within a Docker environment, however this would "flaw" the 
*OpenWrt-like experience*.


Another, probably better approach could be to have *slim-containers* 
which only run `ash` and let the user start whatever is needed, e.g. 
`ubusd && uhttpd` and thereby have access to a LuCI interface to play 
with.


This would follow the experience from other popular containers like 
`alpine` or `debian`. This would also allow us to become an 
"official" container, which would allow to be used as `docker run -it 
openwrt` rather than `docker run -it openwrt/rootfs`. Some efforts 
were made here[2].


I'd prefer the latter option; only offer SDK and ImageBuilder and let 
the rootfs become a "official" Docker container without any running 
services. Whoever needs services can use `FROM openwrt` within a 
Dockerfile  and run whatever is needed.


Best,
Paul

[1]: https://gitlab.com/openwrt/docker/-/merge_requests/47
[2]: https://github.com/docker-library/official-images/pull/7975


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel



___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] busybox: use $(AUTORELEASE) and SPDX

[Paul Spooren]

use AUTORELEASE since BusyBox is often updaten and PKG_RELEASE is not
consistently bumped. Also use SPDX license headers to be machine
readable and bump the copyright year to 2021.

Signed-off-by: Paul Spooren 
---
I'd like to see this backported as well.

 package/utils/busybox/Makefile | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 76a910361e..242a2428ac 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -1,15 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Copyright (C) 2006-2020 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+# Copyright (C) 2006-2021 OpenWrt.org
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
 PKG_VERSION:=1.33.1
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 PKG_FLAGS:=essential
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH 21.02] openwrt-keyring: Only copy sign key for 21.02

[Paul Spooren]

May 17, 2021 21:53:01 Hauke Mehrtens :


On 5/17/21 8:10 PM, Paul Spooren wrote:

On 5/16/21 3:57 PM, Hauke Mehrtens wrote:

On 5/16/21 3:26 PM, Hauke Mehrtens wrote:

Instead of adding all public signature keys from the openwrt-keyring
repository only add the key which is used to sign the OpenWrt 21.02 
feeds.


If one of the other keys would be compromised this would not affect
users of 21.02 release builds.

Signed-off-by: Hauke Mehrtens 
---


Acked-by: Paul Spooren 

In my opinion this patch still lacks a *openwrt-next* key to allow a 
secure upgrade path between major releases.


We can also add this later in some service release.
Currently I wanted to remove all the personal keys from the trusted 
keys.


Hauke

--

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[RFC] OpenWrt within a Docker container

[Paul Spooren]

Hello,

after some back and forth I'd like to request some more opinions on what 
kind of Docker containers to offer containing the OpenWrt rootfs. This 
is not about the SDK or ImageBuilder Docker containers.


tl;dr:

Should we ship `slim` containers only, running a OpenWrt shell (ash) and 
nothing more? Whoever wants services to run (e.g. ubus) should run 
additional containers and glue them together via mounts? Or should we 
run /sbin/init or `procd` to have a *OpenWrt-like experience*, with 
LuCI, ubusd and friends.


/tl;dr

Currently the `openwrt/rootfs` container is shipped with minimal 
modifications and starts `/sbin/init` as default action.


Running the container for e.g. LuCI development within a local shell 
results in the following output:


```
user@reactor:~$ docker run -it openwrt/rootfs
Failed to resize receive buffer: Operation not permitted
/etc/preinit: line 5: can't create 
/sys/devices/system/cpu/microcode/reload: Read-only file system

ip: RTNETLINK answers: Operation not permitted
Press the [f] key and hit [enter] to enter failsafe mode
Press the [1], [2], [3] or [4] key and hit [enter] to select the debug level
ip: can't send flush request: Operation not permitted
ip: SIOCSIFFLAGS: Operation not permitted
Please press Enter to activate this console.
--- %< ---
root@da3dfbdc5ae4:/#

```

Some init scripts fail due to missing privileges. The console input is 
only possible by using a patched /etc/inittab file and multiple services 
keep failing, most problematic the `network` service since it tries and 
fails in a fast loop to flush some interfaces.


A possible patch is available[1] which disables services obsolete within 
a Docker environment, however this would "flaw" the *OpenWrt-like 
experience*.


Another, probably better approach could be to have *slim-containers* 
which only run `ash` and let the user start whatever is needed, e.g. 
`ubusd && uhttpd` and thereby have access to a LuCI interface to play with.


This would follow the experience from other popular containers like 
`alpine` or `debian`. This would also allow us to become an "official" 
container, which would allow to be used as `docker run -it openwrt` 
rather than `docker run -it openwrt/rootfs`. Some efforts were made here[2].


I'd prefer the latter option; only offer SDK and ImageBuilder and let 
the rootfs become a "official" Docker container without any running 
services. Whoever needs services can use `FROM openwrt` within a 
Dockerfile  and run whatever is needed.


Best,
Paul

[1]: https://gitlab.com/openwrt/docker/-/merge_requests/47
[2]: https://github.com/docker-library/official-images/pull/7975


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH 1/2] ethtool: update to version 5.12

[Paul Spooren]

On 5/16/21 6:01 PM, Robert Marko wrote:

Update ethtool to newly released 5.12 version.

Signed-off-by: Robert Marko 
---

Could this be moved to packages.git?

  package/network/utils/ethtool/Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/network/utils/ethtool/Makefile 
b/package/network/utils/ethtool/Makefile
index 3efc90490b..d645cf9bbb 100644
--- a/package/network/utils/ethtool/Makefile
+++ b/package/network/utils/ethtool/Makefile
@@ -8,13 +8,13 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=ethtool

-PKG_VERSION:=5.10
+PKG_VERSION:=5.12
  PKG_RELEASE:=1
  
  PKG_MAINTAINER:=Felix Fietkau 

  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
  PKG_SOURCE_URL:=@KERNEL/software/network/ethtool
-PKG_HASH:=817d5396a9307b4c637b435d4c558b8f5f964a1464a035ca3c0180f4cc93cfcf
+PKG_HASH:=f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07
  
  PKG_LICENSE:=GPL-2.0

  PKG_LICENSE_FILES:=COPYING


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH 19.07 2/2] openwrt-keyring: Only copy sign key for 19.07 and 21.02

[Paul Spooren]

On 5/16/21 3:55 PM, Hauke Mehrtens wrote:

Instead of adding all public signature keys from the openwrt-keyring
repository only add the key which is used to sign the OpenWrt 19.07
feeds and the 21.02 feeds to allow checking the next release.

If one of the other keys would be compromised this would not affect
users of 19.07 release builds.

Signed-off-by: Hauke Mehrtens 
---

Acked-by: Paul Spooren 

  package/system/openwrt-keyring/Makefile | 7 +--
  1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/system/openwrt-keyring/Makefile 
b/package/system/openwrt-keyring/Makefile
index 6f3aa65622..037809a667 100644
--- a/package/system/openwrt-keyring/Makefile
+++ b/package/system/openwrt-keyring/Makefile
@@ -3,7 +3,7 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=openwrt-keyring

-PKG_RELEASE:=1
+PKG_RELEASE:=2
  
  PKG_SOURCE_PROTO:=git

  PKG_SOURCE_URL=$(PROJECT_GIT)/keyring.git
@@ -32,7 +32,10 @@ Build/Compile=
  
  define Package/openwrt-keyring/install

$(INSTALL_DIR) $(1)/etc/opkg/keys/
-   $(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/* $(1)/etc/opkg/keys/
+   # Public usign key for 19.07 release builds
+   $(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/f94b9dd6febac963 
$(1)/etc/opkg/keys/
+   # Public usign key for 21.02 release builds
+   $(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/2f8b0b98e08306bf 
$(1)/etc/opkg/keys/
  endef
  
  $(eval $(call BuildPackage,openwrt-keyring))


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] openwrt-keyring: Only copy sign key for snapshots

[Paul Spooren]

Hi,

On 5/13/21 1:32 AM, Hauke Mehrtens wrote:

Instead of adding all public signature keys from the openwrt-keyring
repository only add the key which is used to sign the master feeds.

If one of the other keys would be compromised this would not affect
users of master snapshot builds.

Signed-off-by: Hauke Mehrtens 
---


Thanks for working on this.

I'm still in favor to include a *openwrt-next* key which becomes the 
signing key for the next release. This way a upgrade step between 
release branches is possible.



As far as I know the other keys are not compromised, this is just a
precaution.

I would do similar changes to 21.02 and 19.07 to only add the key which
is used for this specific release.
In case of 19.07 please add 21.02 release keys as well, since it's *the 
next key*.

Instead of adding just this single key, should we add all keys of
currently maintained releases like 19.07, 21.02 and master key into all
3 branches?

How about adding keys like that:
19.07: 19.07 + 21.02 keys
21.02: 21.02 + openwrt-next keys
snapshot: snapshot key

The snapshot key stays the same "forever", it shouldn't be included in 
releases.



The signature verification of sysupgrade images is currently not used as
far as I know, so normal we do not need the keys for of other releases.


If the `ucert` package is installed and the env variable 
`REQUIRE_IMAGE_SIGNATURE` is set, the images are verified. This should 
eventually become the default.


So ideally we already start shipping the correct keys before activating 
the extra security measurements.




  package/system/openwrt-keyring/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/system/openwrt-keyring/Makefile 
b/package/system/openwrt-keyring/Makefile
index 6f3aa65622d5..ceaccf1fc527 100644
--- a/package/system/openwrt-keyring/Makefile
+++ b/package/system/openwrt-keyring/Makefile
@@ -32,7 +32,8 @@ Build/Compile=
  
  define Package/openwrt-keyring/install

$(INSTALL_DIR) $(1)/etc/opkg/keys/
-   $(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/* $(1)/etc/opkg/keys/
+   # Public usign key for unattended snapshot builds
+   $(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/b5043e70f9a75cde 
$(1)/etc/opkg/keys/
  endef
  
  $(eval $(call BuildPackage,openwrt-keyring))


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH ansible] inventories: prod: 21.02: include TLS support

[Paul Spooren]

On 5/14/21 10:32 AM, Petr Štetiar wrote:

OpenWrt 21.02 currently ships with wolfssl and LuCI for http.  It would
be nice to also have https support included in the default images.

To add this the following packages have to be added:

  * luci-ssl  (969 Bytes ipkg)
  * px5g-wolfssl (5216 bytes ipkg)

The ath79 images increased by 2.2 KBytes when these packages were
included.

Automatic redirection from HTTP to HTTPS was disabled in commit
0cf3c5dd7257 ("uhttpd: don't redirect to HTTPS by default") so folks
willing to use HTTPS would need to reach that service explicitly.

References: 
https://lists.infradead.org/pipermail/openwrt-devel/2021-May/035056.html
Acked-by: Hauke Mehrtens 
Signed-off-by: Petr Štetiar 
---

Acked-by: Paul Spooren 

  inventories/prod/group_vars/all/02-openwrt-prod.yml | 1 +
  1 file changed, 1 insertion(+)

diff --git a/inventories/prod/group_vars/all/02-openwrt-prod.yml 
b/inventories/prod/group_vars/all/02-openwrt-prod.yml
index 63ad0511b0de..f257fdcb10d5 100644
--- a/inventories/prod/group_vars/all/02-openwrt-prod.yml
+++ b/inventories/prod/group_vars/all/02-openwrt-prod.yml
@@ -149,6 +149,7 @@ buildmaster:
CONFIG_KERNEL_KALLSYMS=n
CONFIG_AUTOREMOVE=y
CONFIG_PACKAGE_luci=y
+  CONFIG_PACKAGE_luci-ssl=y
CONFIG_IB=y
CONFIG_SDK=y
  


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] added support for comfast jw-ew74

[Paul Spooren]

On 5/4/21 5:28 PM, e...@daloft.com wrote:

From: eric 

---


Hi Eric,

thank you very much for your contribution!

Please read the following guide, there are some formal issues with this 
patch:


https://openwrt.org/submitting-patches

Patches should always include the full and real name of the author and a 
commit message which describes the patch. Especially when adding new 
devices, the commit message should include steps to flash the device and 
a hardware overview. Please see the git log to find examples.


Kind regards,
Paul


  .../ramips/dts/mt7628an_comfast_jw-ew74.dts   | 147 ++
  target/linux/ramips/image/mt76x8.mk   |   9 ++
  .../mt76x8/base-files/etc/board.d/01_leds |   7 +
  .../mt76x8/base-files/etc/board.d/02_network  |   4 +
  4 files changed, 167 insertions(+)
  create mode 100644 target/linux/ramips/dts/mt7628an_comfast_jw-ew74.dts

diff --git a/target/linux/ramips/dts/mt7628an_comfast_jw-ew74.dts 
b/target/linux/ramips/dts/mt7628an_comfast_jw-ew74.dts
new file mode 100644
index 00..dc6aaeb4fe
--- /dev/null
+++ b/target/linux/ramips/dts/mt7628an_comfast_jw-ew74.dts
@@ -0,0 +1,147 @@
+/dts-v1/;
+
+#include "mt7628an.dtsi"
+
+#include 
+#include 
+
+/ {
+   #address-cells = <0x01>;
+   #size-cells = <0x01>;
+   compatible = "comfast,jw-ew74\0mediatek,mt7628an-soc";
+   model = "Comfast JW-EW74";
+
+   chosen {
+   bootargs = "console=ttyS0,115200";
+   };
+
+
+
+   gpio-keys-polled {
+   #address-cells = <0x01>;
+   #size-cells = <0x00>;
+   compatible = "gpio-keys-polled";
+   poll-interval = <0x14>;
+
+   reset {
+   gpios = < 0x06 0x01>;
+   label = "reset";
+   linux,code = ;
+   };
+   };
+
+   gpio-leds {
+   compatible = "gpio-leds";
+
+   wifi {
+   gpios = < 0x0c 0x01>;
+   label = "comfast:blue:wifi";
+   };
+
+   wifi0 {
+   gpios = < 0x0b 0x01>;
+   label = "comfast:blue:wifi0";
+   };
+
+   wifi1 {
+   gpios = < 0x05 0x01>;
+   label = "comfast:blue:wifi1";
+   };
+
+   wifi2 {
+   gpios = < 0x0d 0x01>;
+   label = "comfast:blue:wifi2";
+   };
+   };
+
+};
+
+
+
+
+
+ {
+status = "okay";
+
+flash@0 {
+compatible = "jedec,spi-nor";
+reg = <0>;
+spi-max-frequency = <1000>;
+
+   partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+
+   partition@0 {
+   label = "u-boot";
+   read-only;
+   reg = <0x00 0x3>;
+   };
+
+
+   partition@3 {
+   label = "u-boot-env";
+   read-only;
+   reg = <0x3 0x1>;
+   };
+
+   factory: partition@4 {
+   label = "factory";
+   read-only;
+   reg = <0x4 0x1>;
+   };
+
+   partition@5 {
+   compatible = "denx,uimage";
+   label = "firmware";
+   reg = <0x5 0x77>;
+   };
+
+   partition@7c {
+   label = "configs";
+   reg = <0x7c 0x4>;
+   };
+   partition@100 {
+label = "reserve";
+reg = <0x100 0x100>;
+};
+
+   };
+   };
+};
+
+ {
+   mtd-mac-address = < 0xe00 >;
+};
+
+
+ {
+
+   status = "okay";
+   mtd-mac-address = < 0xe00>;
+   mtd-mac-address-increment = <1>;
+
+};
+
+
+ {
+   status = "okay";
+};
+
+
+ {
+wifi: mt76@0,0 {
+reg = <0x 0 0 0 0>;
+   mediatek,5ghz = <0x00>;
+mediatek,mtd-eeprom = < 0x8000>;
+   ieee80211-freq-limit = <500 600>;
+   mtd-mac-address = < 0xe00>;
+   mtd-mac-address-increment = <2>;
+   
+};
+};
+   {
+   status = "okay";
+};
diff --git a/target/linux/ramips/image/mt76x8.mk 
b/target/linux/ramips/image/mt76x8.mk
index d5a9684dba..35402edc3b 100644
--- 

Re: [PATCH] fstools: block: fix segfault on mount with no target

[Paul Spooren]

On 5/4/21 3:23 PM, Daniel Danzberger wrote:

When a UCI fstab mount config doesn't contain a target option,
a 'block mount' call segfaults when comparing a mount's target (NULL)
to a found mount point returned by find_mount_point()

Signed-off-by: Daniel Danzberger 
---

Acked-by: Paul Spooren 

  block.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block.c b/block.c
index f094216..c6d93d1 100644
--- a/block.c
+++ b/block.c
@@ -1021,7 +1021,7 @@ static int mount_device(struct probe_info *pr, int type)
  
  	mp = find_mount_point(pr->dev);

if (mp) {
-   if (m && m->type == TYPE_MOUNT && strcmp(m->target, mp)) {
+   if (m && m->type == TYPE_MOUNT && m->target && 
strcmp(m->target, mp)) {
ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
err = -1;
} else


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] Extend checks on build prerequisites for building OpenWRT core

[Paul Spooren]

On 4/20/21 1:08 AM, Bas Mevissen wrote:

OpenWRT requires a number of Perl modules to be installed. It wasn't checking 
on all of them.
This patch adds checks for Perl FindBin, File::Copy, File::Compare and 
Thread::Queue modules.

Failing to install these, will have the build break at some point. By adding 
these to the
prereq-build.mk script, they are checked on forehand.

Tested on a Fedora 33 and 34 (beta) that was freshly installed. Fedora appears 
to
break up Perl modules into small packages that need to be installed for the 
build to succeed.

Signed-off-by: Bas Mevissen 
---
  include/prereq-build.mk | 13 -
  1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 86c22f7c95..cb3dcc51e3 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -65,11 +65,22 @@ $(eval $(call TestHostCommand,perl-data-dumper, \
Please install the Perl Data::Dumper module, \
perl -MData::Dumper -e 1))
  
+$(eval $(call TestHostCommand,perl-findbin, \

+   Please install the Perl FindBin module, \
+   perl -MFindBin -e 1))
+
+$(eval $(call TestHostCommand,perl-file-copy, \
+   Please install the Perl File::Copy module, \
+   perl -MFile::Copy -e 1))
+
+$(eval $(call TestHostCommand,perl-file-compare, \
+   Please install the Perl File::Compare module, \
+   perl -MFile::Compare -e 1))
Could you please point me to where this module is required? I naively 
grepped through openwrt.git and couldn't find it. The other added 
requirements seem fine.

+
  $(eval $(call TestHostCommand,perl-thread-queue, \
Please install the Perl Thread::Queue module, \
perl -MThread::Queue -e 1))
  
-

  $(eval $(call SetupHostCommand,tar,Please install GNU 'tar', \
gtar --version 2>&1 | grep GNU, \
gnutar --version 2>&1 | grep GNU, \


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [RFC] procd: Use /dev/console for serial console if exists

[Paul Spooren]

Apr 25, 2021 8:34:06 AM Gaurav Pathak :


inittab.c: Use "/dev/console" character device (5,1) if it
is present, before trying "/sys/class/tty/console/active" in
case if console kernel command line is not provided during boot
and to allow container environment to use it as login PTY console.

Signed-off-by: Gaurav Pathak 
---


LGTM


inittab.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/inittab.c b/inittab.c
index 2c2270c..716bcee 100644
--- a/inittab.c
+++ b/inittab.c
@@ -190,7 +190,13 @@ static void askconsole(struct init_action *a)
   */
  tty = get_cmdline_val("console", line, sizeof(line));
  if (tty == NULL) {
-   tty = get_active_console(line, sizeof(line));
+    if (dev_exist("/dev/console")) {
+    tty = "/dev/console";
+    }
+    else {
+    tty = get_active_console(line, sizeof(line));
+    }
+
  }
  if (tty != NULL) {
    split = strchr(tty, ',');
--
2.25.1

--

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [RFC] procd: Use /dev/console for serial console if exists

[Paul Spooren]

On 4/24/21 1:01 AM, Gaurav Pathak wrote:

Modified inittab.c to use "/dev/console" as preferred console if exists.

Signed-off-by: Gaurav Pathak 
---


Could you please elaborate why this is useful?


Edited inittab.c to check and use "/dev/console" as the first
console device before parsing "/sys/class/tty/console/active".
  inittab.c | 8 +++-
  1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/inittab.c b/inittab.c
index 2c2270c..716bcee 100644
--- a/inittab.c
+++ b/inittab.c
@@ -190,7 +190,13 @@ static void askconsole(struct init_action *a)
 */
tty = get_cmdline_val("console", line, sizeof(line));
if (tty == NULL) {
-   tty = get_active_console(line, sizeof(line));
+if (dev_exist("/dev/console")) {
+tty = "/dev/console";
+}
+else {
+tty = get_active_console(line, sizeof(line));
+}
+
}
if (tty != NULL) {
split = strchr(tty, ',');


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] maketag.sh/makebranch.sh: handle https download URLs

[Paul Spooren]

On 4/19/21 9:45 AM, Hauke Mehrtens wrote:

Since OpenWrt 21.02 we use https for our download server, detect these
URLs too.

Signed-off-by: Hauke Mehrtens 
---

Can't you kick out anything lede-project related while at it?


To use the https URLs I have to provide the URL manually now:
./maketag.sh -k F1B767859CB2EBC7 -v 21.02.0-rc1 -u 
https://downloads.openwrt.org/releases


  makebranch.sh | 2 +-
  maketag.sh| 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/makebranch.sh b/makebranch.sh
index e8472d7..4b3ab77 100755
--- a/makebranch.sh
+++ b/makebranch.sh
@@ -133,7 +133,7 @@ sed -e 's!^RELEASE:=.*!RELEASE:='"$codename"'!g' \
include/version.mk > include/version.branch && \
mv include/version.branch include/version.mk
  
-sed -e 's!http://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version-SNAPSHOT"'!g' \

+sed -e 
's!\(http\|https\)://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version-SNAPSHOT"'!g'
 \
package/base-files/image-config.in > package/base-files/image-config.branch 
&& \
mv package/base-files/image-config.branch 
package/base-files/image-config.in
  
diff --git a/maketag.sh b/maketag.sh

index 72767b8..5152411 100755
--- a/maketag.sh
+++ b/maketag.sh
@@ -138,7 +138,7 @@ sed -e 's!\(VERSION_NUMBER:=\$(if 
.*\),[^,]*)!\1,'"$version"')!g' \
include/version.mk > include/version.tagged && \
mv include/version.tagged include/version.mk
  
-sed -e 's!http://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version"'!g' \

+sed -e 
's!\(http\|https\)://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version"'!g'
 \
  -e '/config VERSION_CODE_FILENAMES/ { :next; n; s!default y!default n!; t 
end; b next }; :end' \
package/base-files/image-config.in > package/base-files/image-config.tagged 
&& \
mv package/base-files/image-config.tagged 
package/base-files/image-config.in


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: Requiring 2FA on OpenWrt GitHub organization

[Paul Spooren]

I did so a week ago and asked everyone with direct emails to turn on 2FA. 
Everyone who didn't respond after 3 weeks and multiple mails lost their 
commit access.


If there's someone with commit access and no 2FA, it was added 
afterwards.

--



Apr 11, 2021 4:52:22 AM Etienne Champetier 
:



Hi All,

There are currently 65 members in OpenWrt org, 58 of them with 2FA 
enabled.

Requiring 2FA would kick out the 7 users without 2FA, 6 of them have
no OpenWrt related activity for more than 2 or 3 years, I've emailed
the 7th one privately.

Anyone see any problem enforcing 2FA ?

Best
Etienne

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH keyring] usign: drop personal + outdated keys except 21.02

[Paul Spooren]

The ./usign folder is added to every OpenWrt image, it should only
contain the most necessary keys. At this point it contains both a
selection of personal developer keys and keys of EOL releases.

Remove them all and only keep the 21.02 key.

A future commit should add a "next release" key, which is later renamed
to the next release name (e.g. 21.08). This approach should allow secure
upgrade between releases.

Signed-off-by: Paul Spooren 
---
This commit should be merged into a `openwrt-21.02` branch which is then
selected by the 21.02 release.

 usign/0b26f36ae0f4106d | 2 --
 usign/1035ac73cc4e59e3 | 2 --
 usign/5151f69420c3f508 | 2 --
 usign/72a57f2191b211e0 | 2 --
 usign/792d9d9b39f180dc | 2 --
 usign/9ef4694208102c43 | 2 --
 usign/b2d571e0880ff617 | 2 --
 usign/b5043e70f9a75cde | 2 --
 usign/c10b9afab19ee428 | 2 --
 usign/dace9d4df16896bf | 2 --
 usign/dd6de0d06bbd3d85 | 2 --
 usign/f94b9dd6febac963 | 2 --
 12 files changed, 24 deletions(-)
 delete mode 100644 usign/0b26f36ae0f4106d
 delete mode 100644 usign/1035ac73cc4e59e3
 delete mode 100644 usign/5151f69420c3f508
 delete mode 100644 usign/72a57f2191b211e0
 delete mode 100644 usign/792d9d9b39f180dc
 delete mode 100644 usign/9ef4694208102c43
 delete mode 100644 usign/b2d571e0880ff617
 delete mode 100644 usign/b5043e70f9a75cde
 delete mode 100644 usign/c10b9afab19ee428
 delete mode 100644 usign/dace9d4df16896bf
 delete mode 100644 usign/dd6de0d06bbd3d85
 delete mode 100644 usign/f94b9dd6febac963

diff --git a/usign/0b26f36ae0f4106d b/usign/0b26f36ae0f4106d
deleted file mode 100644
index a436c1f..000
--- a/usign/0b26f36ae0f4106d
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key of Stijn Tintel
-RWQLJvNq4PQQbSGZ05Az9jXSt/xlw/IfWc6USiB2FHEUoWL7QpMibzv6
diff --git a/usign/1035ac73cc4e59e3 b/usign/1035ac73cc4e59e3
deleted file mode 100644
index 6ae478a..000
--- a/usign/1035ac73cc4e59e3
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key for 18.06 release builds
-RWQQNaxzzE5Z41cVmEh2rilAPKLsyfPKm+S4BJWA1Yv+LP1hKebmGtXi
diff --git a/usign/5151f69420c3f508 b/usign/5151f69420c3f508
deleted file mode 100644
index 37de5ff..000
--- a/usign/5151f69420c3f508
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key of Hans Dedecker
-RWRRUfaUIMP1CAL9wvk3ABBHdUM+3SjMvIuJlK68b3b04Pw3wiaiAfxX
diff --git a/usign/72a57f2191b211e0 b/usign/72a57f2191b211e0
deleted file mode 100644
index 367ece0..000
--- a/usign/72a57f2191b211e0
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key of Jo-Philipp Wich
-RWRypX8hkbIR4FLhtx5pjXcAIsI1iPUIcI5bMG8jZoiCkrwTstECBPqL
diff --git a/usign/792d9d9b39f180dc b/usign/792d9d9b39f180dc
deleted file mode 100644
index 089fbaf..000
--- a/usign/792d9d9b39f180dc
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key for 17.01 "Reboot" release builds
-RWR5LZ2bOfGA3FGliZosEDhodiAKDOISmQs/mmjo4rhcbFtqkibJqMzo
diff --git a/usign/9ef4694208102c43 b/usign/9ef4694208102c43
deleted file mode 100644
index 3757905..000
--- a/usign/9ef4694208102c43
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key of Álvaro Fernández Rojas
-RWSe9GlCCBAsQwI5+wztnWKHfBlvPFP2G00FvZyx+Wfv9AwSViUwo/s2
diff --git a/usign/b2d571e0880ff617 b/usign/b2d571e0880ff617
deleted file mode 100644
index 5bcd5f4..000
--- a/usign/b2d571e0880ff617
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key of Hauke Mehrtens
-RWSy1XHgiA/2F8nrQOTCa0aRCJzueqmDRzhxuwBJuC++Btb37yr7FKG0
diff --git a/usign/b5043e70f9a75cde b/usign/b5043e70f9a75cde
deleted file mode 100644
index 82d7677..000
--- a/usign/b5043e70f9a75cde
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key for unattended snapshot builds
-RWS1BD5w+adc3j2Hqg9+b66CvLR7NlHbsj7wjNVj0XGt/othDgIAOJS+
diff --git a/usign/c10b9afab19ee428 b/usign/c10b9afab19ee428
deleted file mode 100644
index 006b6c7..000
--- a/usign/c10b9afab19ee428
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key of Alexander Couzens
-RWTBC5r6sZ7kKA/C5VnxUbJw5E0vy3MGo3MP2eXCQlgg65+2si4MKBnf
diff --git a/usign/dace9d4df16896bf b/usign/dace9d4df16896bf
deleted file mode 100644
index f1fc0ea..000
--- a/usign/dace9d4df16896bf
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key of Ted Hess
-RWTazp1N8WiWvy7rYxstJqaMzGiS4XfW1oyYrk2vwJMRBeBF+8xEA+EZ
diff --git a/usign/dd6de0d06bbd3d85 b/usign/dd6de0d06bbd3d85
deleted file mode 100644
index a57a150..000
--- a/usign/dd6de0d06bbd3d85
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key of John Crispin
-RWTdbeDQa709heyMmwDZjWmlhcTCUv/q+3TBYDPdJAGRuys6xcxE09fp
diff --git a/usign/f94b9dd6febac963 b/usign/f94b9dd6febac963
deleted file mode 100644
index 4c54114..000
--- a/usign/f94b9dd6febac963
+++ /dev/null
@@ -1,2 +0,0 @@
-untrusted comment: Public usign key for 19.07 release builds
-RWT5S53W/rrJY9BiIod3JF04AZ/eU1xDpVOb+rjZzAQBEcoETGx8BXEK
-- 
2.27.0


___
openwrt-devel mailin

[PATCH 1/2] ncurses: split long line of supported terminfo

[Paul Spooren]

The terminfo files were all in one row which is terrible to read.
Split them over multiple lines to improve readability.

Signed-off-by: Paul Spooren 
---
 package/libs/ncurses/Makefile | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index cc1e960a0c..b42f23fa85 100644
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -120,7 +120,18 @@ ifneq ($(HOST_OS),FreeBSD)
mv dir (echo -ne "\xdir"); \
done \
)
-   for file in a/ansi d/dumb l/linux r/rxvt r/rxvt-unicode s/screen 
v/vt100 v/vt102 x/xterm x/xterm-color x/xterm-256color; do \
+   for file in \
+   a/ansi \
+   d/dumb \
+   l/linux \
+   r/rxvt \
+   r/rxvt-unicode \
+   s/screen \
+   v/vt100 \
+   v/vt102 \
+   x/xterm \
+   x/xterm-color \
+   x/xterm-256color; do \
$(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname file`; \
$(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/file \
$(1)/usr/share/terminfo/file; \
-- 
2.27.0


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH 2/2] ncurses: add screen-256color terminfo

[Paul Spooren]

The terminfo is required by the popular terminal multiplexer screen and
tmux, offer it by default as the size impact is minimal with 885 Bytes.

Signed-off-by: Paul Spooren 
---
 package/libs/ncurses/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index b42f23fa85..04a9a38515 100644
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
 PKG_VERSION:=6.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
@@ -127,6 +127,7 @@ ifneq ($(HOST_OS),FreeBSD)
r/rxvt \
r/rxvt-unicode \
s/screen \
+   s/screen-256color \
v/vt100 \
v/vt102 \
x/xterm \
-- 
2.27.0


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] build: remove GCC7 support

[Paul Spooren]

On Fr, Mär 26, 2021 at 02:28, Rosen Penev  wrote:

On Fri, Mar 26, 2021 at 1:49 AM Paul Spooren  wrote:


 Since we recently branched a new release which already ships with 
GCC7,

 version 6 could be considered obsolete.

version 6?


Subject is right, body is wrong. So it's about removing GCC7 support 
because for the latest release GCC8 is used.




Could also mention GCC7 does not support std::filesystem , which is
needed by some programs such as gerbera in the packages feed. That's
actually why I don't backport gerbera to 19.07.


 Signed-off-by: Paul Spooren 

Acked-by: Rosen Penev 

 ---
  toolchain/gcc/Config.in   |   4 -
  toolchain/gcc/Config.version  |  10 -
  toolchain/gcc/common.mk   |   4 -
  .../001-revert_register_mode_search.patch |  77 
  .../patches/7.5.0/002-case_insensitive.patch  |  24 ---
  .../gcc/patches/7.5.0/010-documentation.patch |  35 
  .../patches/7.5.0/110-Fix-MIPS-PR-84790.patch |  20 --
  .../gcc/patches/7.5.0/230-musl_libssp.patch   |  28 ---
  .../300-mips_Os_cpu_rtx_cost_model.patch  |  21 --
  .../7.5.0/800-arm_v5te_no_ldrd_strd.patch |  32 
  .../7.5.0/810-arm-softfloat-libgcc.patch  |  33 
  .../gcc/patches/7.5.0/820-libgcc_pic.patch|  44 -
  .../7.5.0/840-armv4_pass_fix-v4bx_to_ld.patch |  28 ---
  .../patches/7.5.0/850-use_shared_libgcc.patch |  54 --
  .../patches/7.5.0/851-libgcc_no_compat.patch  |  22 ---
  .../patches/7.5.0/870-ppc_no_crtsavres.patch  |  18 --
  .../gcc/patches/7.5.0/881-no_tm_section.patch |  22 ---
  .../patches/7.5.0/900-bad-mips16-crt.patch|  30 ---
  .../gcc/patches/7.5.0/910-mbsd_multi.patch| 146 --
  .../7.5.0/920-specs_nonfatal_getenv.patch |  22 ---
  .../7.5.0/930-fix-mips-noexecstack.patch  | 111 ---
  ...ibffi-fix-MIPS-softfloat-build-issue.patch | 175 
-

  .../7.5.0/940-no-clobber-stamp-bits.patch |  33 
  .../7.5.0/950-cpp_file_path_translation.patch | 181 
--

  ...mpilation-when-making-cross-compiler.patch |  73 ---
  25 files changed, 1247 deletions(-)
  delete mode 100644 
toolchain/gcc/patches/7.5.0/001-revert_register_mode_search.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/002-case_insensitive.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/010-documentation.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/110-Fix-MIPS-PR-84790.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/230-musl_libssp.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/300-mips_Os_cpu_rtx_cost_model.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/800-arm_v5te_no_ldrd_strd.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/810-arm-softfloat-libgcc.patch

  delete mode 100644 toolchain/gcc/patches/7.5.0/820-libgcc_pic.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/840-armv4_pass_fix-v4bx_to_ld.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/850-use_shared_libgcc.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/851-libgcc_no_compat.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/870-ppc_no_crtsavres.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/881-no_tm_section.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/900-bad-mips16-crt.patch

  delete mode 100644 toolchain/gcc/patches/7.5.0/910-mbsd_multi.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/920-specs_nonfatal_getenv.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/930-fix-mips-noexecstack.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/940-no-clobber-stamp-bits.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/950-cpp_file_path_translation.patch
  delete mode 100644 
toolchain/gcc/patches/7.5.0/960-gotools-fix-compilation-when-making-cross-compiler.patch


 diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
 index f0fc31d567..1f22b35bc6 100644
 --- a/toolchain/gcc/Config.in
 +++ b/toolchain/gcc/Config.in
 @@ -6,10 +6,6 @@ choice
 help
   Select the version of gcc you wish to use.

 -   config GCC_USE_VERSION_7
 -   bool "gcc 7.x"
 -   depends on !arc
 -
 config GCC_USE_VERSION_8
 bool "gcc 8.x"

 diff --git a/toolchain/gcc/Config.version 
b/toolchain/gcc/Config.version

 index 967ce9e489..3db4b90e21 100644
 --- a/toolchain/gcc/Config.version
 +++ b/toolchain/gcc/Config.version
 @@ -1,7 +1,3 @@
 -config GCC_VERSION_7
 -   default y if GCC_USE_VERSION_7
 -   bool
 -
  config GCC_VERSION_9
 default y if GCC_USE_VERSION_9
 bool
 @@ -12,12 +8,6 @@ config GCC_VERSION_10

  config GCC_VERSION
 string
 -   default "7.5.0" if GCC_VERSION_7
 default "9.3.0" if GCC_VERSION_9
 default "10.2.0"if G

[PATCH] build: remove GCC7 support

[Paul Spooren]

Since we recently branched a new release which already ships with GCC7,
version 6 could be considered obsolete.

Signed-off-by: Paul Spooren 
---
 toolchain/gcc/Config.in   |   4 -
 toolchain/gcc/Config.version  |  10 -
 toolchain/gcc/common.mk   |   4 -
 .../001-revert_register_mode_search.patch |  77 
 .../patches/7.5.0/002-case_insensitive.patch  |  24 ---
 .../gcc/patches/7.5.0/010-documentation.patch |  35 
 .../patches/7.5.0/110-Fix-MIPS-PR-84790.patch |  20 --
 .../gcc/patches/7.5.0/230-musl_libssp.patch   |  28 ---
 .../300-mips_Os_cpu_rtx_cost_model.patch  |  21 --
 .../7.5.0/800-arm_v5te_no_ldrd_strd.patch |  32 
 .../7.5.0/810-arm-softfloat-libgcc.patch  |  33 
 .../gcc/patches/7.5.0/820-libgcc_pic.patch|  44 -
 .../7.5.0/840-armv4_pass_fix-v4bx_to_ld.patch |  28 ---
 .../patches/7.5.0/850-use_shared_libgcc.patch |  54 --
 .../patches/7.5.0/851-libgcc_no_compat.patch  |  22 ---
 .../patches/7.5.0/870-ppc_no_crtsavres.patch  |  18 --
 .../gcc/patches/7.5.0/881-no_tm_section.patch |  22 ---
 .../patches/7.5.0/900-bad-mips16-crt.patch|  30 ---
 .../gcc/patches/7.5.0/910-mbsd_multi.patch| 146 --
 .../7.5.0/920-specs_nonfatal_getenv.patch |  22 ---
 .../7.5.0/930-fix-mips-noexecstack.patch  | 111 ---
 ...ibffi-fix-MIPS-softfloat-build-issue.patch | 175 -
 .../7.5.0/940-no-clobber-stamp-bits.patch |  33 
 .../7.5.0/950-cpp_file_path_translation.patch | 181 --
 ...mpilation-when-making-cross-compiler.patch |  73 ---
 25 files changed, 1247 deletions(-)
 delete mode 100644 
toolchain/gcc/patches/7.5.0/001-revert_register_mode_search.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/002-case_insensitive.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/010-documentation.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/110-Fix-MIPS-PR-84790.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/230-musl_libssp.patch
 delete mode 100644 
toolchain/gcc/patches/7.5.0/300-mips_Os_cpu_rtx_cost_model.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/800-arm_v5te_no_ldrd_strd.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/810-arm-softfloat-libgcc.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/820-libgcc_pic.patch
 delete mode 100644 
toolchain/gcc/patches/7.5.0/840-armv4_pass_fix-v4bx_to_ld.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/850-use_shared_libgcc.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/851-libgcc_no_compat.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/870-ppc_no_crtsavres.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/881-no_tm_section.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/900-bad-mips16-crt.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/910-mbsd_multi.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/920-specs_nonfatal_getenv.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/930-fix-mips-noexecstack.patch
 delete mode 100644 
toolchain/gcc/patches/7.5.0/931-libffi-fix-MIPS-softfloat-build-issue.patch
 delete mode 100644 toolchain/gcc/patches/7.5.0/940-no-clobber-stamp-bits.patch
 delete mode 100644 
toolchain/gcc/patches/7.5.0/950-cpp_file_path_translation.patch
 delete mode 100644 
toolchain/gcc/patches/7.5.0/960-gotools-fix-compilation-when-making-cross-compiler.patch

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index f0fc31d567..1f22b35bc6 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -6,10 +6,6 @@ choice
help
  Select the version of gcc you wish to use.
 
-   config GCC_USE_VERSION_7
-   bool "gcc 7.x"
-   depends on !arc
-
config GCC_USE_VERSION_8
bool "gcc 8.x"
 
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 967ce9e489..3db4b90e21 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,7 +1,3 @@
-config GCC_VERSION_7
-   default y if GCC_USE_VERSION_7
-   bool
-
 config GCC_VERSION_9
default y if GCC_USE_VERSION_9
bool
@@ -12,12 +8,6 @@ config GCC_VERSION_10
 
 config GCC_VERSION
string
-   default "7.5.0" if GCC_VERSION_7
default "9.3.0" if GCC_VERSION_9
default "10.2.0"if GCC_VERSION_10
default "8.4.0"
-
-config GCC_USE_IREMAP
-   bool
-   default y if GCC_USE_VERSION_7
-   default n
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 55fad1fcc4..2107c8afba 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -28,10 +28,6 @@ GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
-ifeq ($(PKG_VERSION),7.5.0)
-  PKG_HASH:=b81946e7f01f90528a1f7352ab08cc602b9ccc05d4e44da4bd501c

[PATCH] build,json: 3rd fixup of default_packages

[Paul Spooren]

This became a bit of a tragedy, caused by a corner cases which wasn't
put into account during testing. DEFAULT_PACKAGES are defined in
target/linux//Makefile but also in
target/linux///target.mk.

The latter was no longer imported when using DUMP=1, however not using
DUMP=1 while running the Makefile in target/linux// caused duplicate
packages in the list.

As a solution, which should have been used from day 0, `make` runs in
target/linux/ without DUMP=1, resulting in no duplicate packages and all
inclusions from include/target.mk, linux/target//{Makefile,
/target.mk}

While at it, sort the list of default packages.

Signed-off-by: Paul Spooren 
---
 scripts/json_overview_image_info.py | 23 +--
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/scripts/json_overview_image_info.py 
b/scripts/json_overview_image_info.py
index cd814a19c0..8dbd24af2d 100755
--- a/scripts/json_overview_image_info.py
+++ b/scripts/json_overview_image_info.py
@@ -33,28 +33,13 @@ for json_file in work_dir.glob("*.json"):
 )
 
 if output:
-output["default_packages"] = run(
+default_packages, output["arch_packages"] = run(
 [
 "make",
 "--no-print-directory",
 "-C",
-"target/linux/{}".format(output["target"].split("/")[0]),
+"target/linux/",
 "val.DEFAULT_PACKAGES",
-"DUMP=1",
-],
-stdout=PIPE,
-stderr=PIPE,
-check=True,
-env=environ.copy().update({"TOPDIR": Path().cwd()}),
-universal_newlines=True,
-).stdout.split()
-
-output["arch_packages"] = run(
-[
-"make",
-"--no-print-directory",
-"-C",
-"target/linux/{}".format(output["target"].split("/")[0]),
 "val.ARCH_PACKAGES",
 ],
 stdout=PIPE,
@@ -62,7 +47,9 @@ if output:
 check=True,
 env=environ.copy().update({"TOPDIR": Path().cwd()}),
 universal_newlines=True,
-).stdout.strip()
+).stdout.splitlines()
+
+output["default_packages"] = sorted(default_packages.split())
 
 output_path.write_text(json.dumps(output, sort_keys=True, separators=(",", 
":")))
 else:
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] mwlwifi: remove target dependency

[Paul Spooren]

On Di, Mär 23, 2021 at 00:17, Daniel Golle  
wrote:

On Mon, Mar 22, 2021 at 11:14:39PM +0100, Hauke Mehrtens wrote:

 On 3/21/21 10:17 PM, Daniel Golle wrote:
 > Users complained that building images for various mvebu Linksys 
devices

 > fails when using the ImageBuilder, it complains about the package
 > 'mwlwifi-firmware-88w8964' not being found.
 >
 > Turns out the package builds fine in mvebu/cortex-a9 images 
build, but
 > isn't built at all for arm/cortex-a9 packages. This is because we 
are
 > using the SDK for bcm53xx/generic to build packages for 
arm/cortex-a9,

 > hence the dependency for @TARGET_mvebu fails.
 >
 > Remove the target dependency as kmod-mwlwifi as well as firmware
 > packages actually build fine on all platforms (and people might 
even

 > want to use Marvell mPCIe Wifi on non-mvebu platforms).
 > As a result, the missing 'mwlwifi-firmware-'* packages should 
become

 > available for arm/cortex-a9 (and all other platforms).

 Does this happen for the kmod or only for the firmware package? If 
this only
 happens for the firmware package, does it help to add this to the 
package

 Makefile:
 PKG_FLAGS:=nonshared


It's only the firmware package missing as the kmods are built in 
phase1.




 I think we only have this problems with the packages build by the 
2. phase
 build bot which is shared between different targets with the same 
CPU. When
 we make it nonshared it should be build together with the target. 
We had a

 similar problems with the mtd package some time ago.


Yes, adding PKG_FLAGS:=nonshared would solve the problem (and 
shouldn't

affect the anyway nonshared kmod build in the same package Makefile).
I forgot about that one...



 We should check if there are more places with similar problem.


Other potentially affected packages which do have target dependencies
set but do not have PKG_FLAGS:=nonshared set:

network/utils/ltq-dsl-base
firmware/cypress-nvram


Could you do a treewide fixup patch?



All other non-kmod core packages seem to have nonshared set in case
they got target dependencies.


Cheers


Daniel

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel




___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] build: artifacts add dependency for builded images

[Paul Spooren]

On Sat Mar 20, 2021 at 10:58 PM HST, Oskari Lemmela wrote:
> Add possibility to use images and initramfs in artifacts.
>
> Signed-off-by: Oskari Lemmela 
> ---

Hi, could you please elaborate on your use-case?

> include/image.mk | 6 --
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/include/image.mk b/include/image.mk
> index 29df0938bc..8b7b2b9740 100644
> --- a/include/image.mk
> +++ b/include/image.mk
> @@ -478,6 +478,7 @@ define Device/Build/initramfs
> $$(if $$(CONFIG_JSON_OVERVIEW_IMAGE_INFO),
> $(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json,))
>  
> $(KDIR)/$$(KERNEL_INITRAMFS_NAME):: image_prepare
> + $(1)-images: $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)
> $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE):
> $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
> cp $$^ $$@
>  
> @@ -570,6 +571,7 @@ define Device/Build/image
> $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \
> $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX))
> $(eval $(call Device/Export,$(KDIR)/tmp/$(call
> DEVICE_IMG_NAME,$(1),$(2)),$(1)))
> + $(3)-images: $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX)
>  
> ROOTFS/$(1)/$(3) := \
> $(KDIR)/root.$(1)$$(strip \
> @@ -628,7 +630,7 @@ endef
> define Device/Build/artifact
> $$(_TARGET): $(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1)
> $(eval $(call Device/Export,$(KDIR)/tmp/$(DEVICE_IMG_PREFIX)-$(1)))
> - $(KDIR)/tmp/$(DEVICE_IMG_PREFIX)-$(1): $$(KDIR_KERNEL_IMAGE)
> + $(KDIR)/tmp/$(DEVICE_IMG_PREFIX)-$(1): $$(KDIR_KERNEL_IMAGE)
> $(2)-images
> @rm -f $$@
> $$(call concat_cmd,$(ARTIFACT/$(1)))
>  
> @@ -651,7 +653,7 @@ define Device/Build
> $$(call Device/Build/image,$$(fs),$$(image),$(1)
>  
> $$(eval $$(foreach artifact,$$(ARTIFACTS), \
> - $$(call Device/Build/artifact,$$(artifact
> + $$(call Device/Build/artifact,$$(artifact),$(1
>  
> endef
>  
> --
> 2.25.1
>
>
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] build,json: fix duplicates in default_packages

[Paul Spooren]

Calling without the DUMP=1 argument causes the target specific Makefile
to be "included" again which adds the target specific packages twice,
once on the actual run and once included from `include/target.mk`.

This led to duplicate package entries, causing confusion in downstream
projects using the generated JSON files.

While at it, apply `black` style to Python script.

Signed-off-by: Paul Spooren 
---
 scripts/json_overview_image_info.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/json_overview_image_info.py 
b/scripts/json_overview_image_info.py
index ca6fbbc962..23d8dcb857 100755
--- a/scripts/json_overview_image_info.py
+++ b/scripts/json_overview_image_info.py
@@ -38,9 +38,10 @@ if output:
 "make",
 "--no-print-directory",
 "-C",
-"target/linux/{}".format(output['target'].split('/')[0]),
+"target/linux/{}".format(output["target"].split("/")[0]),
 "val.DEFAULT_PACKAGES",
 "val.ARCH_PACKAGES",
+"DUMP=1",
 ],
 stdout=PIPE,
 stderr=PIPE,
-- 
2.30.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] procd: Adding support to detect Pantavisor Container Platform

[Paul Spooren]

On Sat, Mar 20, 2021 at 20:16, Gaurav Pathak 
 wrote:
Added a new file pv_platform.h having function is_pantavisor() to 
detect
the pantavisor container platform, as it runs a custom modified 
version
of LXC, so detecting LXC using is_container() is not returning 
expected

result.
pv_platform.h is derived from container.h to check if procd is running
in a pantavisor container environment.

Signed-off-by: Gaurav Pathak 
---


Can't you merge the detection of `/pantavisor` into the 
`is_container()` function? I'd guess that no container ever needs /dev 
mounted as tmpfs, so you could replace is_pantavisor with is_container?



 initd/early.c   |  5 -
 initd/zram.c|  3 ++-
 plug/coldplug.c |  3 ++-
 pv_platform.h   | 37 +
 state.c |  3 ++-
 5 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 pv_platform.h

diff --git a/initd/early.c b/initd/early.c
index 7b281b2..a564861 100644
--- a/initd/early.c
+++ b/initd/early.c
@@ -26,6 +26,7 @@
 #include "init.h"
 #include "../libc-compat.h"
 #include "../container.h"
+#include "../pv_platform.h"

 static void
 early_dev(void)
@@ -61,7 +62,9 @@ early_mounts(void)
 		mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | 
MS_NOSUID, 0);
 		mount("sysfs", "/sys", "sysfs", MS_NOATIME | MS_NODEV | MS_NOEXEC 
| MS_NOSUID, 0);
 		mount("cgroup", "/sys/fs/cgroup", "cgroup",  MS_NODEV | MS_NOEXEC 
| MS_NOSUID, 0);
-		mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOSUID, 
"mode=0755,size=512K");

+   if (!is_pantavisor()) {
+			mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOSUID, 
"mode=0755,size=512K");

+   }
ignore(symlink("/tmp/shm", "/dev/shm"));
mkdir("/dev/pts", 0755);
 		mount("devpts", "/dev/pts", "devpts", MS_NOATIME | MS_NOEXEC | 
MS_NOSUID, "mode=600");

diff --git a/initd/zram.c b/initd/zram.c
index 380fe0e..21bb3a5 100644
--- a/initd/zram.c
+++ b/initd/zram.c
@@ -13,6 +13,7 @@

 #include "../log.h"
 #include "../container.h"
+#include "../pv_platform.h"

 #include "init.h"

@@ -117,7 +118,7 @@ mount_zram_on_tmp(void)
waitpid(pid, NULL, 0);
}

-   if (!is_container()) {
+   if (!is_container() && !is_pantavisor()) {
 		ret = mount("/dev/zram0", "/tmp", "ext4", MS_NOSUID | MS_NODEV | 
MS_NOATIME, "errors=continue,noquota");

if (ret < 0) {
ERROR("Can't mount /dev/zram0 on /tmp: %m\n");
diff --git a/plug/coldplug.c b/plug/coldplug.c
index b185083..37edba4 100644
--- a/plug/coldplug.c
+++ b/plug/coldplug.c
@@ -24,6 +24,7 @@

 #include "hotplug.h"
 #include "../container.h"
+#include "../pv_platform.h"

 static struct uloop_process udevtrigger;

@@ -45,7 +46,7 @@ void procd_coldplug(void)
char *argv[] = { "udevtrigger", NULL };
unsigned int oldumask = umask(0);

-   if (!is_container()) {
+   if (!is_container() && !is_pantavisor()) {
umount2("/dev/pts", MNT_DETACH);
umount2("/dev/", MNT_DETACH);
mount("tmpfs", "/dev", "tmpfs", MS_NOSUID, 
"mode=0755,size=512K");
diff --git a/pv_platform.h b/pv_platform.h
new file mode 100644
index 000..4045875
--- /dev/null
+++ b/pv_platform.h
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 2017 Pantacor Ltd.
+*
+* Permission is hereby granted, free of charge, to any person 
obtaining a copy
+* of this software and associated documentation files (the 
"Software"), to deal
+* in the Software without restriction, including without limitation 
the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, 
and/or sell
+* copies of the Software, and to permit persons to whom the Software 
is

+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be 
included in all

+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT 
SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 
OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
DEALINGS IN THE

+* SOFTWARE.
+*/
+
+#ifndef __PV_PLATFORM_H
+#define __PV_PLATFORM_H
+
+#include 
+#include 
+#include 
+
+static inline bool is_pantavisor() {
+   struct stat s;
+   int pv_r = stat("/pantavisor", );
+   return pv_r == 0;
+}
+
+#endif
+
diff --git a/state.c b/state.c
index e117ea3..d72a971 100644
--- a/state.c
+++ b/state.c
@@ -21,6 +21,7 @@
 #include 

 #include "container.h"
+#include "pv_platform.h"
 #include "procd.h"
 #include "syslog.h"
 #include "plug/hotplug.h"
@@ -104,7 +105,7 @@ static void perform_halt()
/* Allow time for last message to reach serial console, 

Re: compiling only packages that have patented functionality

[Paul Spooren]

Mar 17, 2021 12:37:26 AM Alberto Bursi :

I'm investigating about making an unofficial third party repository 
with OpenWrt (non-kmod) packages where patented functionality is 
enabled. For example ffmpeg from packages is missing some functionality 
in its "non-patented" form and most end users won't be able to just 
recompile from sources with that option enabled.


Is there a non-hacky way to build only packages that are affected by 
the "patented functionality" switch in the build system?


At the moment the only thing I can think about is a script that parses 
the package makefiles and compiles a list, and then builds only those 
packages with the SDK or buildroot.


The packages.git CI uses a little script to determine what packages 
changes. I think that step could be trivially modified to find patent 
packages.


Once you have the names, you could pass them to a GitHub action to 
automatically compile and upload/store.


I briefly describe a setup here:
https://forum.openwrt.org/t/github-action-for-package-building-and-testing/91324

Paul ___

openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

--

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] build,ib: add STRIP_ABI option for manifest

[Paul Spooren]

The ImageBuilder `make manifest` prints all installed packages. This
function can be used to create a list of package and corresponding
package versions before attempting image creation.

When called with `--strip-abi` OPKG can automatically strip attached
ABIVersions from package names. Make this function accessible for the
ImageBuilder by adding a `STRIP_ABI` variable.

Signed-off-by: Paul Spooren 
---
 target/imagebuilder/files/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/imagebuilder/files/Makefile 
b/target/imagebuilder/files/Makefile
index 2d1e040286..aeae98aacd 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -54,6 +54,7 @@ Print manifest:
 
make manifest PROFILE="" # override the default target 
profile
make manifest PACKAGES=" [ [ ...]]" # include extra 
packages
+   make manifest STRIP_ABI=1 # remove ABI version from printed package 
names
 
 endef
 $(eval $(call shexport,Helptext))
@@ -129,7 +130,7 @@ _call_manifest: FORCE
mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
$(MAKE) package_reload >/dev/null
$(MAKE) package_install >/dev/null
-   $(OPKG) list-installed
+   $(OPKG) list-installed $(if $(STRIP_ABI),--strip-abi)
 
 package_index: FORCE
@echo >&2
-- 
2.30.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH v3] scripts,ipkg-build: format code with shfmt

[Paul Spooren]

The script improves readability by using an automatic code formatter.

Signed-off-by: Paul Spooren 
---
 scripts/ipkg-build | 62 --
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index c112270a2b..a0840b175e 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -7,6 +7,7 @@
 #   Updated to work on Familiar Pre0.7rc1, with busybox tar.
 #   Note it Requires: binutils-ar (since the busybox ar can't create)
 #   For UID debugging it needs a better "find".
+# format code via `shfmt -sr -w ipkg-build`
 set -e
 
 version=1.0
@@ -46,7 +47,7 @@ pkg_appears_sane() {
 
if echo "$pkg" | grep '[^a-zA-Z0-9_.+-]'; then
echo "*** Error: Package name $name contains illegal 
characters, (other than [a-z0-9.+-])" >&2
-   PKG_ERROR=1;
+   PKG_ERROR=1
fi
 
if [ -f "$CONTROL/conffiles" ]; then
@@ -71,14 +72,14 @@ resolve_file_mode_id() {
local var=$1 type=$2 name=$3 id
 
case "$name" in
-   root)
-   id=0
+   root)
+   id=0
;;
-   *[!0-9]*)
-   id=$(sed -ne "s#^$type $name 
\\([0-9]\\+\\)\\b.*\$#\\1#p" "$TOPDIR/tmp/.packageusergroup" 2>/dev/null)
+   *[!0-9]*)
+   id=$(sed -ne "s#^$type $name \\([0-9]\\+\\)\\b.*\$#\\1#p" 
"$TOPDIR/tmp/.packageusergroup" 2> /dev/null)
;;
-   *)
-   id=$name
+   *)
+   id=$name
;;
esac
 
@@ -93,17 +94,17 @@ resolve_file_mode_id() {
 file_modes=""
 usage="Usage: $0 [-v] [-h] [-m]  []"
 while getopts "hvm:" opt; do
-case $opt in
-   v ) echo "$version"
-   exit 0
-   ;;
-   h ) echo "$usage"  >&2 ;;
-   m ) file_modes=$OPTARG ;;
-   \? )echo "$usage"  >&2
+   case $opt in
+   v)
+   echo "$version"
+   exit 0
+   ;;
+   h) echo "$usage" >&2 ;;
+   m) file_modes=$OPTARG ;;
+   \?) echo "$usage" >&2 ;;
esac
 done
 
-
 shift $((OPTIND - 1))
 
 # continue on to process additional arguments
@@ -114,8 +115,8 @@ case $# in
;;
 2)
dest_dir=$2
-   if [ "$dest_dir" = "." ] || [ "$dest_dir" = "./" ] ; then
-   dest_dir=$PWD
+   if [ "$dest_dir" = "." ] || [ "$dest_dir" = "./" ]; then
+   dest_dir=$PWD
fi
;;
 *)
@@ -152,18 +153,21 @@ echo $CONTROL > "$tmp_dir"/tarX
 cd "$pkg_dir"
 for file_mode in $file_modes; do
case $file_mode in
-   /*:*:*:*)
-   ;;
+   /*:*:*:*) ;;
+
*)
-   echo "ERROR: file modes must use absolute path and contain 
user:group:mode"
-   echo "$file_mode"
-   exit 1
-   ;;
+   echo "ERROR: file modes must use absolute path and contain 
user:group:mode"
+   echo "$file_mode"
+   exit 1
+   ;;
esac
 
-   mode=${file_mode##*:}; path=${file_mode%:*}
-   group=${path##*:}; path=${path%:*}
-   user=${path##*:};  path=${path%:*}
+   mode=${file_mode##*:}
+   path=${file_mode%:*}
+   group=${path##*:}
+   path=${path%:*}
+   user=${path##*:}
+   path=${path%:*}
 
if ! resolve_file_mode_id uid user "$user"; then
echo "ERROR: unable to resolve uid of $user" >&2
@@ -176,7 +180,7 @@ for file_mode in $file_modes; do
fi
 
chown "$uid:$gid" "$pkg_dir/$path"
-   chmod  "$mode" "$pkg_dir/$path"
+   chmod "$mode" "$pkg_dir/$path"
 done
 $TAR -X "$tmp_dir"/tarX --format=gnu --sort=name -cpf - --mtime="$TIMESTAMP" . 
| gzip -n - > "$tmp_dir"/data.tar.gz
 
@@ -184,14 +188,14 @@ installed_size=$(stat -c "%s" "$tmp_dir"/data.tar.gz)
 sed -i -e "s/^Installed-Size: .*/Installed-Size: $installed_size/" \
"$pkg_dir"/$CONTROL/control
 
-( cd "$pkg_dir"/$CONTROL && $TAR --format=gnu --sort=name -cf -  
--mtime="$TIMESTAMP" . | gzip -n - > "$tmp_dir"/control.tar.gz )
+(cd "$pkg_dir"/$CONTROL && $TAR --format=gnu --sort=name -cf - 
--mtime="$TIMESTAMP" . | gzip -n - > "$tmp_dir"/control.tar.gz)
 rm "$tmp_dir"/tarX
 
 echo "2.0" > "$tmp_dir"/debian-binary
 
 pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
 rm -f "$pkg_file"
-( cd "$tmp_dir" && $TAR --format=gnu --sort=name -cf -  --mtime="$TIMESTAMP" 
./debian-binary ./data.tar.gz ./control.tar.gz | gzip -n - > "$pkg_file" )
+(cd "$tmp_dir" && $TAR --format=gnu --sort=name -cf - --mtime="$TIMESTAMP" 
./debian-binary ./data.tar.gz ./control.tar.gz | gzip -n - > "$pkg_file")
 
 rm "$tmp_dir"/debian-binary "$tmp_dir"/data.tar.gz "$tmp_dir"/control.tar.gz
 rmdir "$tmp_dir"
-- 
2.30.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH v2 3/3] scripts,ipkg-build: format code with shfmt

[Paul Spooren]

Hi Paul,

I'm using shfmt[1] without any extra args. Looking through the issues 
over there[2] I'll reformat it with `-sr` and `-kp`. Thanks for the 
comment.


 -sr redirect operators will be followed by a space
 -kp keep column alignment paddings

Best,
Paul

[1]: https://github.com/mvdan/sh
[2]: https://github.com/mvdan/sh/issues/377

On Tue, Feb 9, 2021 at 13:36, Paul Oranje  wrote:
Op 5 feb. 2021, om 00:59 heeft Paul Spooren  het 
volgende geschreven:


 The script improves readability by using an automatic code 
formatter.


The decreases of the switch case indentation levels make sense, but 
IMHO the removals of the space between redirection and source (e.g. 
degree, nor does placing an empty or small command on the same line 
as the case (e.g. case x) ;;).


Maybe your preferred code formatter/beautifier (which ?) could take 
some options to steer the formatting. Would you agree?


Thanks anyway, bye,
Paul




___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] treewide: extend DEFAULT_PACKAGES before target.mk

[Paul Spooren]

The DEFAULT_PACKAGES are found in every target Makefile and define
packages that should be installed on devices. Appending these packages
after including target.mk results in duplicate package addition.

Without this patch, the target specific DEFAULT_PACKAGES are added
twice, see example below:

TOPDIR=$(pwd) make --no-print-directory -C target/linux/mvebu/ \
val.DEFAULT_PACKAGES
base-files ca-bundle dropbear fstools libc libgcc libustream-wolfssl
logd mtd netifd opkg uci uclient-fetch urandom-seed urngd busybox
procd uboot-envtools kmod-gpio-button-hotplug dnsmasq firewall
ip6tables iptables kmod-ipt-offload odhcp6c odhcpd-ipv6only ppp
ppp-mod-pppoe uboot-envtools kmod-gpio-button-hotplug

After applying this patch, the two duplicate packages are no longer
added, see below:

TOPDIR=$(pwd) make --no-print-directory -C target/linux/mvebu/ \
val.DEFAULT_PACKAGES
base-files ca-bundle dropbear fstools libc libgcc libustream-wolfssl
logd mtd netifd opkg uci uclient-fetch urandom-seed urngd busybox
procd uboot-envtools kmod-gpio-button-hotplug dnsmasq firewall
ip6tables iptables kmod-ipt-offload odhcp6c odhcpd-ipv6only ppp
ppp-mod-pppoe

Signed-off-by: Paul Spooren 
---
This behaviour also results in duplicates in produced JSON files:
https://downloads.openwrt.org/snapshots/targets/mvebu/cortexa9/profiles.json

The package kmod-gpio-button-hotplug is added twice to the
default_packages array.

 target/linux/apm821xx/Makefile   | 4 ++--
 target/linux/bcm47xx/Makefile| 4 ++--
 target/linux/bcm4908/Makefile| 4 ++--
 target/linux/bcm53xx/Makefile| 8 
 target/linux/bcm63xx/Makefile| 4 ++--
 target/linux/bmips/Makefile  | 4 ++--
 target/linux/gemini/Makefile | 4 ++--
 target/linux/imx6/Makefile   | 4 ++--
 target/linux/ipq40xx/Makefile| 3 ++-
 target/linux/ipq806x/Makefile| 3 ++-
 target/linux/kirkwood/Makefile   | 4 ++--
 target/linux/layerscape/Makefile | 4 ++--
 target/linux/malta/Makefile  | 4 ++--
 target/linux/mediatek/Makefile   | 3 ++-
 target/linux/mpc85xx/Makefile| 4 ++--
 target/linux/mvebu/Makefile  | 4 ++--
 target/linux/octeon/Makefile | 4 ++--
 target/linux/omap/Makefile   | 4 ++--
 target/linux/oxnas/Makefile  | 4 ++--
 target/linux/pistachio/Makefile  | 8 
 target/linux/ramips/Makefile | 3 ++-
 target/linux/realtek/Makefile| 8 
 target/linux/rockchip/Makefile   | 4 ++--
 target/linux/sunxi/Makefile  | 6 +++---
 target/linux/tegra/Makefile  | 4 ++--
 target/linux/uml/Makefile| 4 ++--
 target/linux/x86/Makefile| 4 ++--
 target/linux/zynq/Makefile   | 6 +++---
 28 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/target/linux/apm821xx/Makefile b/target/linux/apm821xx/Makefile
index 9c7f276dc0..891db08b72 100644
--- a/target/linux/apm821xx/Makefile
+++ b/target/linux/apm821xx/Makefile
@@ -16,11 +16,11 @@ define Target/Description
Build images for AppliedMicro APM821xx based boards.
 endef
 
-include $(INCLUDE_DIR)/target.mk
-
 KERNELNAME:=uImage
 
 DEFAULT_PACKAGES += \
kmod-leds-gpio kmod-i2c-core kmod-gpio-button-hotplug
 
+include $(INCLUDE_DIR)/target.mk
+
 $(eval $(call BuildTarget))
diff --git a/target/linux/bcm47xx/Makefile b/target/linux/bcm47xx/Makefile
index 9ffd4f3f29..ef6b807e3b 100644
--- a/target/linux/bcm47xx/Makefile
+++ b/target/linux/bcm47xx/Makefile
@@ -17,9 +17,9 @@ define Target/Description
Build firmware images for Broadcom based BCM47xx/53xx routers with MIPS 
CPU, *not* ARM.
 endef
 
-include $(INCLUDE_DIR)/target.mk
-
 DEFAULT_PACKAGES += swconfig nvram otrx \
kmod-leds-gpio kmod-gpio-button-hotplug
 
+include $(INCLUDE_DIR)/target.mk
+
 $(eval $(call BuildTarget))
diff --git a/target/linux/bcm4908/Makefile b/target/linux/bcm4908/Makefile
index 5bee66fe2b..f028aed86d 100644
--- a/target/linux/bcm4908/Makefile
+++ b/target/linux/bcm4908/Makefile
@@ -16,10 +16,10 @@ define Target/Description
Build firmware images for Broadcom BCM4908 SoC family routers.
 endef
 
+DEFAULT_PACKAGES += kmod-usb-ohci kmod-usb2 kmod-usb3
+
 include $(INCLUDE_DIR)/target.mk
 
 KERNELNAME:=Image dtbs
 
-DEFAULT_PACKAGES += kmod-usb-ohci kmod-usb2 kmod-usb3
-
 $(eval $(call BuildTarget))
diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile
index bb356ff244..a45f41661c 100644
--- a/target/linux/bcm53xx/Makefile
+++ b/target/linux/bcm53xx/Makefile
@@ -18,13 +18,13 @@ define Target/Description
Build firmware images for Broadcom based BCM47xx/53xx routers with ARM 
CPU, *not* MIPS.
 endef
 
-include $(INCLUDE_DIR)/target.mk
-
-KERNELNAME:=zImage dtbs
-
 DEFAULT_PACKAGES += swconfig nvram \
osafeloader oseama otrx \
kmod-gpio-button-hotplug \
kmod-leds-gpio
 
+include $(INCLUDE_DIR)/target.mk
+
+KERNELNAME:=zImage dtbs
+
 $(eval $(call BuildTarget))
diff --git a/target/linux/bcm63xx/Makefile b/target/linux/bcm63xx/Makefile
index

[PATCH 0/2] determineable package name with ABIVersions

[Paul Spooren]

Hi, this set contains two patches which solve the same issues in two
different ways, only one should be merged.

ABIVersions of packages are simply attached to the package name, so
package `foobar` with ABIVersion 32 becomes `foobar32`, literally the
name to install via opkg.

This information is stored on-device in /usr/lib/opkg/status.

For a running device it is currently not possible to determine a list
packages which could be used for later releases, as the ABIVersions
likely changed between releases and the package no longer exists as
`foobar32`, but rather `foobar33`.

A way to determine the so called package *SourceName* is required.

Either the `SourceName` should be stored in the Packages index and
thereby end up on the device or the ABIVersion should be stored, because
*PackageName* - *ABIVersion* = *SourceName*.

Storing SourceName for every package increases storage and is redundant
as not all packages use a ABIVersion, meaning *PackageName* and
*SourceName* are the same.

Offering the *ABIVersion* requires more logic for whatever parses the
file, in this case specifically `ubus call rpc-sys packagelist`.

I'm in favor of adding the ABIVersion again and extend the logic of
rpcd/sys.c.

Paul Spooren (2):
  package: store SourceName in Packages index
  include: store ABIVersion in Packages index

 include/package-ipkg.mk | 1 +
 package/Makefile| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
2.30.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH 2/2] include: store ABIVersion in Packages index

[Paul Spooren]

With the existence of ABI versions there is no clean way to determine
the package name without an attached ABI version. The Packages index is
stored on device to know what packages are installed.

The ABIVersion was recently removed in c921650382 "build: drop ABI
version from metadata", while ABI versions still exists. This becomes a
problem if a user tries to export installed packages via `ubus call
rpcd-sys packagelist` which would return package names including the ABI
version. Trying to find these packages in a later release with changes
ABI version is impossible.

This commits adds the `ABIVersion` field again. Knowing both the
combined (SourceName + ABIVersion) and the `ABIVersion` it is possible
to calculate the package `SourceName` without storing it in the
on-device package list.

Signed-off-by: Paul Spooren 
---
 include/package-ipkg.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 082196ccf8..c536999d02 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -184,6 +184,7 @@ $$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
 )$$(call addfield,Section,$(SECTION)
 )$$(call addfield,Require-User,$(USERID)
 )$$(call addfield,SourceDateEpoch,$(PKG_SOURCE_DATE_EPOCH)
+)$$(if $$(ABIV_$(1)),ABIVersion: $$(ABIV_$(1))
 )$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID)
 )$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed
 )$(if $(filter essential,$(PKG_FLAGS)),Essential: yes
-- 
2.30.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH 1/2] package: store SourceName in Packages index

[Paul Spooren]

With the existence of ABI versions there is no clean way to determine
the package name without an attached ABI version. The Packages index is
stored on device to know what packages are installed.

As SourceName is filtered out the real package names are unknown to a
running device. This becomes a problem if a user tries toexport
installed packages via `ubus call rpcd-sys packagelist` which would
return package names including the ABI version. Trying to find these
packages in a later release with changes ABI version is impossible.

This patch stops filtering out the SourceName so it is available on
device.

Signed-off-by: Paul Spooren 
---
 package/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Makefile b/package/Makefile
index a89a6068fa..802100838c 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -87,7 +87,7 @@ $(curdir)/index: FORCE
cd $$d || continue; \
$(SCRIPT_DIR)/apk-make-index.sh . 2>&1; \
$(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages.manifest; \
-   grep -vE 
'^(Maintainer|LicenseFiles|Source|SourceName|Require|SourceDateEpoch)' 
Packages.manifest > Packages; \
+   grep -vE 
'^(Maintainer|LicenseFiles|Source:|Require|SourceDateEpoch)' Packages.manifest 
> Packages; \
case "$$(((64 + $$(stat -L -c%s Packages)) % 128))" in 110|111) 
\
$(call ERROR_MESSAGE,WARNING: Applying padding in 
$$d/Packages to workaround usign SHA-512 bug!); \
{ echo ""; echo ""; } >> Packages;; \
-- 
2.30.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH 2/2] generic: enable netlink ethtool interface

[Paul Spooren]

What's the size change?
--



Mar 4, 2021 12:59:22 PM David Bauer :


The virtual cable tester depends on the netlink interface for ethtool.
Thus, enable it in the generic kernel configuration.

Signed-off-by: David Bauer 
---
target/linux/generic/config-5.10 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/generic/config-5.10 
b/target/linux/generic/config-5.10

index 0fd3e0f5a8..a51605592d 100644
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -1715,7 +1715,7 @@ CONFIG_EPOLL=y
# CONFIG_ET131X is not set
CONFIG_ETHERNET=y
# CONFIG_ETHOC is not set
-# CONFIG_ETHTOOL_NETLINK is not set
+CONFIG_ETHTOOL_NETLINK=y
CONFIG_EVENTFD=y
# CONFIG_EVM is not set
# CONFIG_EXFAT_FS is not set
--
2.30.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH 3/3] COPYING: add COPYING file to specify project licenses

[Paul Spooren]

On Fri, Feb 12, 2021 at 13:53, Adrian Schmutzler 
 wrote:

Since multiple licenses are provided now in the LICENSES folder,
add a COPYING file to specify the project license.

Signed-off-by: Adrian Schmutzler 
---


Acked-by: Paul Spooren 


 COPYING | 12 
 1 file changed, 12 insertions(+)
 create mode 100644 COPYING

diff --git a/COPYING b/COPYING
new file mode 100644
index 00..ea8112482a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,12 @@
+OpenWrt is provided under:
+
+   SPDX-License-Identifier: GPL-2.0-only
+
+Being under the terms of the GNU General Public License version 2 
only,

+according with:
+
+   LICENSES/GPL-2.0
+
+In addition, other licenses may also apply.
+
+All contributions to OpenWrt are subject to this COPYING file.
--
2.20.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel




___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: Initial flashing over "OEM-OpenWrt"

[Paul Spooren]

Feb 8, 2021 5:06:28 AM Piotr Dymacz :


Hi Adrian,

On 06.02.2021 17:42, Adrian Schmutzler wrote:

Hi,
when reviewing device-support PRs, I frequently encounter the case 

that initial flashing means sysupgrading from an OEM-modified OpenWrt.
This obviously means that the config of this OEM-OpenWrt should be 
wiped to prevent config-clashes, but since we only provide sysupgrade in 
this case we can only tell the user to do so.
In this context, I wonder whether we should exploit the compat_version 
for that purpose, i.e. make the initial "proper" OpenWrt image version 
1.1.
Since the OEM-OpenWrt won't know about compat_version, this 
technically will have the same effect as removing SUPPORTED_DEVICES, i.e. 
the user will need to use -F (and we still can't check whether he uses 
the necessary -F -n).
However, the compat_version approach will give us the chance to show 
an additional message, and thus at least will allow to instruct the user 
during the upgrade itself, and not just in the Wiki or in the commit 
message (which he might or might not read).

The purpose of this e-mail is thus to ask:
1. Do we need this, or do we just expect the user to care, i.e. if he 

breaks the device by keeping config it's his fault?


Users are supposed to read flashing instructions provided by the author 
of device's support and follow them. In case of a soft-brick, we have 
failsafe and factory reset which is definitely enough to fix this 
"problem". Let's give our users a little trust here.


Ack




2. Is the compat_version solution acceptable?


Definitely not, but do we really want to introduce more bloat and magic 

just to prevent some extremely rare users mistakes? Please, don't.


3. Does somebody have a better idea, or are there already other 

solutions to the problem I don't know?


Personally I don't consider it as a problem at all.

I believe you should also look at this from the other side. There are 
vendors which are up to date with our code base and updating with 
preserving setting is doable and safe (I'm assuming stable releases 
here).


--
Cheers,
Piotr

Recent example is e.g. this one: 

https://github.com/openwrt/openwrt/pull/3816

Thanks
Adrian

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel



___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

--

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH v2] acx-mac80211: replace dead URLs with OpenWrt CDN

[Paul Spooren]

On Sun Feb 7, 2021 at 9:53 AM HST, Ilya Lipnitskiy wrote:
> Hi Paul,
>
> > > define Download/tiacx111c16_1
> > > FILE:=tiacx111c16_1.2.1_34
> > > - URL:=http://sites.google.com/site/atorkhov/files/
> > > + URL:=@OPENWRT
> >
> > This file is still available, does the download fail as well?
> >
> This one still works, but being a personal google website didn't seem
> as good as just using the CDN consistently across all files. I can
> keep this one site untouched, if you wish. Let me know.

Agree, I pushed your changes. Thank you.

>
> Ilya


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] openpgm: Add Pragmatic General Multicast library

[Paul Spooren]

On Sun, Jan 3, 2021 at 19:42, yehol...@outlook.com wrote:

From: Ye Holmes 

Signed-off-by: Ye Holmes 
---


Can't this package go to packages.git?

 libs/openpgm/Makefile | 64 
+++

 .../0001-Rename-openpgm-5.2.pc.in.patch   | 22 +++
 ...hecksum.c-fix-build-with-32-bits-MMX.patch | 38 +++
 3 files changed, 124 insertions(+)
 create mode 100644 libs/openpgm/Makefile
 create mode 100644 
libs/openpgm/patches/0001-Rename-openpgm-5.2.pc.in.patch
 create mode 100644 
libs/openpgm/patches/0002-openpgm-pgm-checksum.c-fix-build-with-32-bits-MMX.patch


diff --git a/libs/openpgm/Makefile b/libs/openpgm/Makefile
new file mode 100644
index 0..15a03e926
--- /dev/null
+++ b/libs/openpgm/Makefile
@@ -0,0 +1,64 @@
+#
+# Copyright (C) 2021 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public 
License v2.

+# See /LICENSE for more information.
+#
+# This Makefile for OpenPGM
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=openpgm
+PKG_VERSION:=5.3.128
+PKG_RELEASE:=1
+
+PKG_SOURCE:=release-5-3-128.tar.gz
+PKG_SOURCE_URL:=https://github.com/steve-o/openpgm/archive
+PKG_HASH:=8d707ef8dda45f4a7bc91016d7f2fed6a418637185d76c7ab30b306499c6d393
+
+PKG_MAINTAINER:=Ye Holmes 
+PKG_LICENSE:=LGPL-2.1-or-later
+PKG_LICENSE_FILES:=openpgm/pgm/LICENSE
+PKG_CPE_ID:=cpe:/a:openpgm:openpgm
+
+PKG_FIXUP:=autoreconf
+PKG_BUILD_DIR:=$(BUILD_DIR)/openpgm-release-5-3-128
+include $(INCLUDE_DIR)/package.mk
+
+define Package/openpgm
+  TITLE:=OpenPGM, an implementation of the PGM protocol
+  URL:=http://openpgm.googlecode.com/
+  SECTION:=libs
+  CATEGORY:=Libraries
+endef
+
+define Package/openpgm/description
+  OpenPGM is a library implementing the PGM reliable multicast
+  network protocol. For more information about OpenPGM, see:
+  http://openpgm.googlecode.com/
+endef
+
+CONFIGURE_VARS += ac_cv_file__proc_cpuinfo=yes \
+ac_cv_file__dev_rtc=no ac_cv_file__dev_hpet=no
+CONFIGURE_ARGS += --enable-static=no --enable-shared=yes
+
+define Build/Prepare
+   $(call Build/Prepare/Default)
+   mv $(PKG_BUILD_DIR)/openpgm/pgm/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/InstallDev
+   $(INSTALL_DIR) $(1)/usr/include/pgm
+   $(CP) $(PKG_BUILD_DIR)/include/pgm/* $(1)/usr/include/pgm/
+   $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+   $(CP) $(PKG_BUILD_DIR)/.libs/libpgm*.so* $(1)/usr/lib/
+   $(CP) $(PKG_BUILD_DIR)/openpgm-5.3.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/openpgm/install
+   $(INSTALL_DIR) $(1)/usr/lib
+   $(CP) $(PKG_BUILD_DIR)/.libs/libpgm*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,openpgm))
diff --git a/libs/openpgm/patches/0001-Rename-openpgm-5.2.pc.in.patch 
b/libs/openpgm/patches/0001-Rename-openpgm-5.2.pc.in.patch

new file mode 100644
index 0..a51a026f9
--- /dev/null
+++ b/libs/openpgm/patches/0001-Rename-openpgm-5.2.pc.in.patch
@@ -0,0 +1,22 @@
+From 240634b1afb968a051f8c68696eae2a582a02450 Mon Sep 17 00:00:00 
2001

+From: Fabrice Fontaine 
+Date: Mon, 31 Aug 2020 20:16:25 +0200
+Subject: [PATCH 1/2] Rename openpgm-5.2.pc.in
+
+This will fix the following build failure:
+
+config.status: error: cannot find input file: `openpgm-5.3.pc.in'
+
+Signed-off-by: Fabrice Fontaine 
+---
+ openpgm/pgm/{openpgm-5.2.pc.in => openpgm-5.3.pc.in} | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename openpgm/pgm/{openpgm-5.2.pc.in => openpgm-5.3.pc.in} (100%)
+
+diff --git a/openpgm/pgm/openpgm-5.2.pc.in 
b/openpgm/pgm/openpgm-5.3.pc.in

+similarity index 100%
+rename from openpgm/pgm/openpgm-5.2.pc.in
+rename to openpgm/pgm/openpgm-5.3.pc.in
+--
+2.25.1
+
diff --git 
a/libs/openpgm/patches/0002-openpgm-pgm-checksum.c-fix-build-with-32-bits-MMX.patch 
b/libs/openpgm/patches/0002-openpgm-pgm-checksum.c-fix-build-with-32-bits-MMX.patch

new file mode 100644
index 0..2012021c0
--- /dev/null
+++ 
b/libs/openpgm/patches/0002-openpgm-pgm-checksum.c-fix-build-with-32-bits-MMX.patch

@@ -0,0 +1,38 @@
+From b7fa865fa6b06d97d424c500fd1c4bc44c096359 Mon Sep 17 00:00:00 
2001

+From: Fabrice Fontaine 
+Date: Sun, 1 Nov 2020 22:46:18 +0100
+Subject: [PATCH 2/2] openpgm/pgm/checksum.c: fix build with 32 bits 
MMX

+
+Build with i386-pentium-mmx or i686 is broken since version 5-3-128 
and

+https://github.com/steve-o/openpgm/commit/b276dc15be5d4e6e1143b9de25d09f63f9c85135
+because _mm_cvtm64_si64 is undefined resulting in the following build
+failure for example on zeromq:
+
+/srv/storage/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/8.3.0/../../../../i586-buildroot-linux-musl/bin/ld: 
/srv/storage/autobuild/run/instance-3/output-1/host/i586-buildroot-linux-musl/sysroot/usr/lib32/libpgm-5.3.so.0: 
undefined reference to `_mm_cvtm64_si64'

+
+So use the fallback if __x86_64__ is not defined
+
+Fixes:
+ - 
http://autobuild.buildroot.org/results/01d9be37e8a743307128f53f41785654c9971e1a

+
+Signed-off-by: Fabrice Fontaine 
+---
+ 

Re: [PATCH v2] acx-mac80211: replace dead URLs with OpenWrt CDN

[Paul Spooren]

Hi Ilya,

thanks for the quick fixup! One comment below.

On Fri Feb 5, 2021 at 7:11 PM HST, Ilya Lipnitskiy wrote:
> erley.org no longer exists; attempting to connect to it during package
> download results in lengthy timeouts. Use the new OpenWrt CDN alias to
> download from reliable OpenWrt mirrors.
>
> Signed-off-by: Ilya Lipnitskiy 
> ---
> package/kernel/acx-mac80211/Makefile | 18 +-
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/package/kernel/acx-mac80211/Makefile
> b/package/kernel/acx-mac80211/Makefile
> index a04b9e28ba..8bb84e5a6a 100644
> --- a/package/kernel/acx-mac80211/Makefile
> +++ b/package/kernel/acx-mac80211/Makefile
> @@ -112,55 +112,55 @@ endef
>  
> define Download/tiacx100
> FILE:=tiacx100
> - URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
> + URL:=@OPENWRT
> HASH:=4f05913c940c2455b267545b12d93ad81fa5eebb0cbee22a2c7588c50525b4f0
> endef
>  
> define Download/tiacx100r0d
> FILE:=tiacx100r0D
> - URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
> + URL:=@OPENWRT
> HASH:=6a4a7fbb24a328a88261bc2a507b2a0bf63c91e831e3f1a8caa4f6599b2215e6
> endef
>  
> define Download/tiacx100r11
> FILE:=tiacx100r11
> - URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
> + URL:=@OPENWRT
> HASH:=e005a93a0b463e01edba2b79038b54c29a7932efee61c851a2ac644b8a4e5dd4
> endef
>  
> define Download/tiacx100r15
> FILE:=tiacx100r15
> - URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
> + URL:=@OPENWRT
> HASH:=c6f40bead5ef45720e2d72bbe4d998367c2c7857eb7716234aedeb2ad98bcdde
> endef
>  
> define Download/tiacx111c16
> FILE:=tiacx111c16
> - URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
> + URL:=@OPENWRT
> HASH:=cc6108d577ebc55b924ff6bab443456d284c63819277cb5460338b2f1bd7
> endef
>  
> define Download/tiacx111c16_1
> FILE:=tiacx111c16_1.2.1_34
> - URL:=http://sites.google.com/site/atorkhov/files/
> + URL:=@OPENWRT

This file is still available, does the download fail as well?

> HASH:=672ed9d02565ab44da450c52f0ced3be99a3a3901f73454455da8e1f98ada220
> endef
>  
> define Download/tiacx111c17
> FILE:=tiacx111c17
> - URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
> + URL:=@OPENWRT
> HASH:=2bb900a5886dbea2d3504623d9f3ac8abbb2e9fdfcf0fe233e77951dff748a40
> endef
>  
> define Download/tiacx111c19
> FILE:=tiacx111c19
> - URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
> + URL:=@OPENWRT
> HASH:=383d86a8cfddf92400d661b4e43a9b855350fa656edd4f75b4aff7fab2d00e90
> endef
>  
> define Download/tiacx111usbc1b
> FILE:=tiacx111usbc1B
> - URL:=http://acx100.erley.org/fw/acx111_2.4.0.70-USB/
> + URL:=@OPENWRT
> HASH:=f3c9e574de7073014ab6eef9a0f6412c53ae521b67723360af753c41401ed4d5
> endef
>  
> --
> 2.30.0


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] acx-mac80211: replace dead URLs with OpenWrt CDN

[Paul Spooren]

On Thu Feb 4, 2021 at 5:24 PM HST, Ilya Lipnitskiy wrote:
> Signed-off-by: Ilya Lipnitskiy 
> ---

Please use URL:=@OPENWRT instead of the full URL, added via:
https://git.openwrt.org/8286f3a3d3a7d65d36ee312c6fd3828d4e4fd048

Also please provide a commit message, e.g. "erley.org does no longer
exists" or whatever. Empty commit messages giving no contexts are not
accepted.

> package/kernel/acx-mac80211/Makefile | 18 +-
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/package/kernel/acx-mac80211/Makefile
> b/package/kernel/acx-mac80211/Makefile
> index a04b9e28ba..119d9d4747 100644
> --- a/package/kernel/acx-mac80211/Makefile
> +++ b/package/kernel/acx-mac80211/Makefile
> @@ -112,55 +112,55 @@ endef
>  
> define Download/tiacx100
> FILE:=tiacx100
> - URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
> + URL:=https://sources.cdn.openwrt.org/
> HASH:=4f05913c940c2455b267545b12d93ad81fa5eebb0cbee22a2c7588c50525b4f0
> endef
>  
> define Download/tiacx100r0d
> FILE:=tiacx100r0D
> - URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
> + URL:=https://sources.cdn.openwrt.org/
> HASH:=6a4a7fbb24a328a88261bc2a507b2a0bf63c91e831e3f1a8caa4f6599b2215e6
> endef
>  
> define Download/tiacx100r11
> FILE:=tiacx100r11
> - URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
> + URL:=https://sources.cdn.openwrt.org/
> HASH:=e005a93a0b463e01edba2b79038b54c29a7932efee61c851a2ac644b8a4e5dd4
> endef
>  
> define Download/tiacx100r15
> FILE:=tiacx100r15
> - URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
> + URL:=https://sources.cdn.openwrt.org/
> HASH:=c6f40bead5ef45720e2d72bbe4d998367c2c7857eb7716234aedeb2ad98bcdde
> endef
>  
> define Download/tiacx111c16
> FILE:=tiacx111c16
> - URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
> + URL:=https://sources.cdn.openwrt.org/
> HASH:=cc6108d577ebc55b924ff6bab443456d284c63819277cb5460338b2f1bd7
> endef
>  
> define Download/tiacx111c16_1
> FILE:=tiacx111c16_1.2.1_34
> - URL:=http://sites.google.com/site/atorkhov/files/
> + URL:=https://sources.cdn.openwrt.org/
> HASH:=672ed9d02565ab44da450c52f0ced3be99a3a3901f73454455da8e1f98ada220
> endef
>  
> define Download/tiacx111c17
> FILE:=tiacx111c17
> - URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
> + URL:=https://sources.cdn.openwrt.org/
> HASH:=2bb900a5886dbea2d3504623d9f3ac8abbb2e9fdfcf0fe233e77951dff748a40
> endef
>  
> define Download/tiacx111c19
> FILE:=tiacx111c19
> - URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
> + URL:=https://sources.cdn.openwrt.org/
> HASH:=383d86a8cfddf92400d661b4e43a9b855350fa656edd4f75b4aff7fab2d00e90
> endef
>  
> define Download/tiacx111usbc1b
> FILE:=tiacx111usbc1B
> - URL:=http://acx100.erley.org/fw/acx111_2.4.0.70-USB/
> + URL:=https://sources.cdn.openwrt.org/
> HASH:=f3c9e574de7073014ab6eef9a0f6412c53ae521b67723360af753c41401ed4d5
> endef
>  
> --
> 2.30.0
>
>
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH v2 1/3] scripts,ipkg-build: apply shellcheck

[Paul Spooren]

This commit cleans the `ipkg-build` script via changes suggested by
shellcheck. These are mostly word splitting issues.

Remove the definition of GZIP, this adds three "lookups" of the `gzip`
binary but the rest of the build system doesn't seem to use such
improvements neither.

Signed-off-by: Paul Spooren 
---
 scripts/ipkg-build | 81 +++---
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index 343aab6caf..8533c97fcc 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -13,7 +13,6 @@ version=1.0
 FIND="$(command -v find)"
 FIND="${FIND:-$(command -v gfind)}"
 TAR="${TAR:-$(command -v tar)}"
-GZIP="$(command -v gzip)"
 
 # try to use fixed source epoch
 if [ -n "$PKG_SOURCE_DATE_EPOCH" ]; then
@@ -31,40 +30,40 @@ ipkg_extract_value() {
 required_field() {
field=$1
 
-   grep "^$field:" < $CONTROL/control | ipkg_extract_value
+   grep "^$field:" < "$CONTROL/control" | ipkg_extract_value
 }
 
 pkg_appears_sane() {
-   local pkg_dir=$1
+   local pkg_dir="$1"
 
-   local owd=$PWD
-   cd $pkg_dir
+   local owd="$PWD"
+   cd "$pkg_dir"
 
PKG_ERROR=0
-   pkg=`required_field Package`
-   version=`required_field Version | sed 's/Version://; s/^.://g;'`
-   arch=`required_field Architecture`
+   pkg="$(required_field Package)"
+   version="$(required_field Version | sed 's/Version://; s/^.://g;')"
+   arch="$(required_field Architecture)"
 
-   if echo $pkg | grep '[^a-zA-Z0-9_.+-]'; then
+   if echo "$pkg" | grep '[^a-zA-Z0-9_.+-]'; then
echo "*** Error: Package name $name contains illegal 
characters, (other than [a-z0-9.+-])" >&2
PKG_ERROR=1;
fi
 
-   if [ -f $CONTROL/conffiles ]; then
-   rm -f $CONTROL/conffiles.resolved
+   if [ -f "$CONTROL/conffiles" ]; then
+   rm -f "$CONTROL/conffiles.resolved"
 
-   for cf in `$FIND $(sed -e "s!^/!$pkg_dir/!" $CONTROL/conffiles) 
-type f`; do
-   echo "${cf#$pkg_dir}" >> $CONTROL/conffiles.resolved
+   for cf in $($FIND $(sed -e "s!^/!$pkg_dir/!" 
"$CONTROL/conffiles") -type f); do
+   echo "${cf#$pkg_dir}" >> "$CONTROL/conffiles.resolved"
done
 
-   rm $CONTROL/conffiles
-   if [ -f $CONTROL/conffiles.resolved ]; then
-   mv $CONTROL/conffiles.resolved $CONTROL/conffiles
-   chmod 0644 $CONTROL/conffiles
+   rm "$CONTROL"/conffiles
+   if [ -f "$CONTROL"/conffiles.resolved ]; then
+   mv "$CONTROL"/conffiles.resolved "$CONTROL"/conffiles
+   chmod 0644 "$CONTROL"/conffiles
fi
fi
 
-   cd $owd
+   cd "$owd"
return $PKG_ERROR
 }
 
@@ -95,17 +94,17 @@ file_modes=""
 usage="Usage: $0 [-v] [-h] [-m]  []"
 while getopts "hvm:" opt; do
 case $opt in
-   v ) echo $version
+   v ) echo "$version"
exit 0
;;
-   h ) echo $usage  >&2 ;;
+   h ) echo "$usage"  >&2 ;;
m ) file_modes=$OPTARG ;;
-   \? )echo $usage  >&2
+   \? )echo "$usage"  >&2
esac
 done
 
 
-shift $(($OPTIND - 1))
+shift $((OPTIND - 1))
 
 # continue on to process additional arguments
 
@@ -115,42 +114,42 @@ case $# in
;;
 2)
dest_dir=$2
-   if [ "$dest_dir" = "." -o "$dest_dir" = "./" ] ; then
+   if [ "$dest_dir" = "." ] || [ "$dest_dir" = "./" ] ; then
dest_dir=$PWD
fi
;;
 *)
-   echo $usage >&2
+   echo "$usage" >&2
exit 1
;;
 esac
 
-pkg_dir=$1
+pkg_dir="$1"
 
-if [ ! -d $pkg_dir ]; then
+if [ ! -d "$pkg_dir" ]; then
echo "*** Error: Directory $pkg_dir does not exist" >&2
exit 1
 fi
 
 # CONTROL is second so that it takes precedence
 CONTROL=
-[ -d $pkg_dir/CONTROL ] && CONTROL=CONTROL
+[ -d "$pkg_dir"/CONTROL ] && CONTROL=CONTROL
 if [ -z "$CONTROL" ]; then
echo "*** Error: Directory $pkg_dir has no CONTROL subdirectory." >&2
exit 1
 fi
 
-if ! pkg_appears_sane $pkg_dir; then
+if ! pkg_appears_sane "$pkg_dir"; then
echo >&2
echo "ipkg-build: Please fix the above errors and t

[PATCH v2 3/3] scripts,ipkg-build: format code with shfmt

[Paul Spooren]

The script improves readability by using an automatic code formatter.

Signed-off-by: Paul Spooren 
---
 scripts/ipkg-build | 71 --
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index c112270a2b..89952cff4e 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -30,7 +30,7 @@ ipkg_extract_value() {
 required_field() {
field=$1
 
-   grep "^$field:" < "$CONTROL/control" | ipkg_extract_value
+   grep "^$field:" <"$CONTROL/control" | ipkg_extract_value
 }
 
 pkg_appears_sane() {
@@ -46,14 +46,14 @@ pkg_appears_sane() {
 
if echo "$pkg" | grep '[^a-zA-Z0-9_.+-]'; then
echo "*** Error: Package name $name contains illegal 
characters, (other than [a-z0-9.+-])" >&2
-   PKG_ERROR=1;
+   PKG_ERROR=1
fi
 
if [ -f "$CONTROL/conffiles" ]; then
rm -f "$CONTROL/conffiles.resolved"
 
for cf in $($FIND $(sed -e "s!^/!$pkg_dir/!" 
"$CONTROL/conffiles") -type f); do
-   echo "${cf#$pkg_dir}" >> "$CONTROL/conffiles.resolved"
+   echo "${cf#$pkg_dir}" >>"$CONTROL/conffiles.resolved"
done
 
rm "$CONTROL"/conffiles
@@ -71,14 +71,14 @@ resolve_file_mode_id() {
local var=$1 type=$2 name=$3 id
 
case "$name" in
-   root)
-   id=0
+   root)
+   id=0
;;
-   *[!0-9]*)
-   id=$(sed -ne "s#^$type $name 
\\([0-9]\\+\\)\\b.*\$#\\1#p" "$TOPDIR/tmp/.packageusergroup" 2>/dev/null)
+   *[!0-9]*)
+   id=$(sed -ne "s#^$type $name \\([0-9]\\+\\)\\b.*\$#\\1#p" 
"$TOPDIR/tmp/.packageusergroup" 2>/dev/null)
;;
-   *)
-   id=$name
+   *)
+   id=$name
;;
esac
 
@@ -93,17 +93,17 @@ resolve_file_mode_id() {
 file_modes=""
 usage="Usage: $0 [-v] [-h] [-m]  []"
 while getopts "hvm:" opt; do
-case $opt in
-   v ) echo "$version"
-   exit 0
-   ;;
-   h ) echo "$usage"  >&2 ;;
-   m ) file_modes=$OPTARG ;;
-   \? )echo "$usage"  >&2
+   case $opt in
+   v)
+   echo "$version"
+   exit 0
+   ;;
+   h) echo "$usage" >&2 ;;
+   m) file_modes=$OPTARG ;;
+   \?) echo "$usage" >&2 ;;
esac
 done
 
-
 shift $((OPTIND - 1))
 
 # continue on to process additional arguments
@@ -114,8 +114,8 @@ case $# in
;;
 2)
dest_dir=$2
-   if [ "$dest_dir" = "." ] || [ "$dest_dir" = "./" ] ; then
-   dest_dir=$PWD
+   if [ "$dest_dir" = "." ] || [ "$dest_dir" = "./" ]; then
+   dest_dir=$PWD
fi
;;
 *)
@@ -148,22 +148,25 @@ fi
 tmp_dir=$dest_dir/IPKG_BUILD.$$
 mkdir "$tmp_dir"
 
-echo $CONTROL > "$tmp_dir"/tarX
+echo $CONTROL >"$tmp_dir"/tarX
 cd "$pkg_dir"
 for file_mode in $file_modes; do
case $file_mode in
-   /*:*:*:*)
-   ;;
+   /*:*:*:*) ;;
+
*)
-   echo "ERROR: file modes must use absolute path and contain 
user:group:mode"
-   echo "$file_mode"
-   exit 1
-   ;;
+   echo "ERROR: file modes must use absolute path and contain 
user:group:mode"
+   echo "$file_mode"
+   exit 1
+   ;;
esac
 
-   mode=${file_mode##*:}; path=${file_mode%:*}
-   group=${path##*:}; path=${path%:*}
-   user=${path##*:};  path=${path%:*}
+   mode=${file_mode##*:}
+   path=${file_mode%:*}
+   group=${path##*:}
+   path=${path%:*}
+   user=${path##*:}
+   path=${path%:*}
 
if ! resolve_file_mode_id uid user "$user"; then
echo "ERROR: unable to resolve uid of $user" >&2
@@ -176,22 +179,22 @@ for file_mode in $file_modes; do
fi
 
chown "$uid:$gid" "$pkg_dir/$path"
-   chmod  "$mode" "$pkg_dir/$path"
+   chmod "$mode" "$pkg_dir/$path"
 done
-$TAR -X "$tmp_dir"/tarX --format=gnu --sort=name -cpf - --mtime="$TIMESTAMP" . 
| gzip -n - > "$tmp_dir"/data.tar.gz
+$TAR -X "$tmp_dir"/tarX --format=gnu --sort=name -cpf - --mtime="$TIMESTAMP" . 
| gzip -n - >"$tmp_dir"/dat

[PATCH v2 2/3] scripts,ipkg-build: use realpath for pkg_dir

[Paul Spooren]

This allows manual execution of the ipkg-build script even with
releative path.

Signed-off-by: Paul Spooren 
---
 scripts/ipkg-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index 8533c97fcc..c112270a2b 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -124,7 +124,7 @@ case $# in
;;
 esac
 
-pkg_dir="$1"
+pkg_dir="$(realpath "$1")"
 
 if [ ! -d "$pkg_dir" ]; then
echo "*** Error: Directory $pkg_dir does not exist" >&2
-- 
2.30.0


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

RE: 20.xx: state of the DSA

[Paul Spooren]

Hi all,

could you please update me on this matter? What's missing and what 
blocking for a release?


The LuCI PR is still open: https://github.com/openwrt/luci/pull/4307

Where there changes to other targets? Can we just do a hybrid release 
at this point?


Best,
Paul

On Fri, Nov 20, 2020 at 16:39, Adrian Schmutzler 
 wrote:

Hi,


 -Original Message-
 From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org]
 On Behalf Of Paul Spooren
 Sent: Freitag, 20. November 2020 01:36
 To: openwrt-devel@lists.openwrt.org
 Subject: 20.xx: state of the DSA

 Hi all,

 DSA (Distributed Switch Architecture)[0] is a main feature of 20.xx 
and one of
 the last blockers for a branch. The goal states[1] support where 
possible, not

 necessarily every target.


since we discuss this in the context of the next stable release, I 
don't think the focus should be on which targets are supported and 
which are not.

20.xx/21.xx will be a mixed release in that context.

Our main interest should be to clarify what needs to be done in order 
to release DSA with proper support (on the platforms that already 
have it), and then get these things done quickly.


Best

Adrian



 This mail thread should be used to get an overview of the missing 
bits.


 The following targets seem use `swconfig`, should/can they be 
ported?

 Please post states and links to work in progress migrations:

 * apm821xx/nand
 * ath25
 * ath79
 * bcm47xx
 * bcm53xx
 * bcm63xx
 * ipq40xx
 * ipq806x
 * kirkwood
 * lantiq/xrx200
 * lantiq/xway
 * lantiq/xway_legacy
 * mediatek
 * mpc85xx
 * ramips/mt7620
 * ramips/mt76x8
 * ramips/rt288x
 * ramips/rt305x
 * ramips/rt3883

 All other targets can be considered as DSA targets? If you're 
working or

 testing around that, please comment and share the status.

 LuCI support is added via a PR[2] on GitHub.

 Best,
 Paul

 [0]: https://www.kernel.org/doc/html/latest/networking/dsa/dsa.html
 [1]: https://openwrt.org/docs/guide-developer/releases/goals/20.xx
 [2]: https://github.com/openwrt/luci/pull/4307

 ___
 openwrt-devel mailing list
 openwrt-devel@lists.openwrt.org
 https://lists.openwrt.org/mailman/listinfo/openwrt-devel




___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: Backporting opkg fixes to 19.07

[Paul Spooren]

On Sun, Jan 31, 2021 at 19:10, Baptiste Jonglez 
 wrote:

Hi,

I've just pushed this to my (brand new) staging tree:

  
https://git.openwrt.org/?p=openwrt/staging/zorun.git;a=shortlog;h=refs/heads/openwrt-19.07


If there are no objections, I will merge that in a couple of days.


Thanks for the backport! Please merge it.



Baptiste

On 24-01-21, Baptiste Jonglez wrote:

 Hi,

 I would like to backport the opkg fix for 
https://bugs.openwrt.org/index.php?do=details_id=2690

 to 19.07.

 The opkg package in 19.07 is a bit old, it's using:

 f2166a8 libopkg: implement lightweight package listing logic

 Since there were several other changes in opkg master, I would 
create a
 new openwrt-19.07 branch in opkg based on f2166a8, and backport 
these commits:


 61b3c62 opkg_verify_integrity: better logging and error conditions
 f73d42f download: purge cached packages that have incorrect checksum
 1c1480e download: factor out the logic for building cache filenames
 293b1ce libopkg: factor out checksum and size verification
 a786e25 download: remove compatibility with old cache naming scheme

 And maybe also this fix for another issue:

 66f458d libopkg: fix md5sum calculation

 As far as I can tell, it shouldn't cause issues such as ABI 
breakage, but

 I prefer if somebody can double-check...

 Thanks,
 Baptiste



___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel




___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH v2] treewide: unify OpenWrt hosted source via @OPENWRT

[Paul Spooren]

Multiple sources are hosted on OpenWrts source server only. The source
URLs to point to the server vary based on different epochs in OpenWrts
history.

Replace all by @OPENWRT which is an "empty" mirror, therefore using the
fallback servers sources.cdn.openwrt.org and sources.openwrt.org.

Signed-off-by: Paul Spooren 
---
 include/download.mk   | 2 +-
 package/boot/fconfig/Makefile | 2 +-
 package/firmware/b43legacy-firmware/Makefile  | 2 +-
 package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile | 2 +-
 package/kernel/broadcom-wl/Makefile   | 2 +-
 package/kernel/lantiq/ltq-adsl/Makefile   | 2 +-
 package/kernel/lantiq/ltq-tapi/Makefile   | 2 +-
 package/kernel/lantiq/ltq-vdsl-mei/Makefile   | 2 +-
 package/kernel/lantiq/ltq-vdsl/Makefile   | 2 +-
 package/kernel/lantiq/ltq-vmmc/Makefile   | 2 +-
 package/kernel/mac80211/broadcom.mk   | 6 +++---
 package/network/config/ltq-adsl-app/Makefile  | 2 +-
 package/network/config/ltq-vdsl-app/Makefile  | 2 +-
 scripts/download.pl   | 2 ++
 tools/lzma-old/Makefile   | 2 +-
 tools/lzma/Makefile   | 2 +-
 16 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/include/download.mk b/include/download.mk
index d393bf3907..25707130cf 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -30,7 +30,7 @@ define dl_method
 $(strip \
   $(if $(filter git,$(2)),$(call dl_method_git,$(1),$(2)),
 $(if $(2),$(2), \
-  $(if $(filter @APACHE/% @GITHUB/% @GNOME/% @GNU/% @KERNEL/% @SF/% 
@SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \
+  $(if $(filter @OPENWRT @APACHE/% @GITHUB/% @GNOME/% @GNU/% @KERNEL/% 
@SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \
 $(if $(filter git://%,$(1)),$(call dl_method_git,$(1),$(2)), \
   $(if $(filter svn://%,$(1)),svn, \
 $(if $(filter cvs://%,$(1)),cvs, \
diff --git a/package/boot/fconfig/Makefile b/package/boot/fconfig/Makefile
index 9b806fe97c..5784477bf4 100644
--- a/package/boot/fconfig/Makefile
+++ b/package/boot/fconfig/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=20080329
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://downloads.openwrt.org/sources
+PKG_SOURCE_URL:=@OPENWRT
 PKG_HASH:=4ff0e8f07e35e46b705c0dbe9d9544ede01ea092a69e3f7db03e55a3f2bb8eb7
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
diff --git a/package/firmware/b43legacy-firmware/Makefile 
b/package/firmware/b43legacy-firmware/Makefile
index 9b9c0070b2..ecbfc32293 100644
--- a/package/firmware/b43legacy-firmware/Makefile
+++ b/package/firmware/b43legacy-firmware/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=3.130.20.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=wl_apsta-$(PKG_VERSION).o
-PKG_SOURCE_URL:=https://downloads.openwrt.org/sources
+PKG_SOURCE_URL:=@OPENWRT
 PKG_HASH:=7dba610b1d96dd14e901bcbce14cd6ecd1b1ac6f5c0035b0d6b6dc46a7c3ef90
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile 
b/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile
index a076fe2596..649325601c 100644
--- a/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile
+++ b/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile
@@ -10,7 +10,7 @@ PKG_NAME:=dsl_vr9_firmware_xdsl
 PKG_VERSION:=05.08.01.08.01.06_05.08.00.0B.01.01_osc
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
+PKG_SOURCE_URL:=@OPENWRT
 PKG_HASH:=44cd94130571fe42dfa8f0f9d44597d104e9e77962617fe38646b7a0b4184a2b
 PKG_BUILD_DEPENDS:=bsdiff/host
 
diff --git a/package/kernel/broadcom-wl/Makefile 
b/package/kernel/broadcom-wl/Makefile
index 661c7f0589..7188c4900e 100644
--- a/package/kernel/broadcom-wl/Makefile
+++ b/package/kernel/broadcom-wl/Makefile
@@ -13,7 +13,7 @@ PKG_VERSION:=5.10.56.27.3
 PKG_RELEASE:=10
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(ARCH).tar.bz2
-PKG_SOURCE_URL:=https://downloads.openwrt.org/sources
+PKG_SOURCE_URL:=@OPENWRT
 
 ifeq ($(ARCH),mipsel)
 PKG_HASH:=26a8c370f48fc129d0731cfd751c36cae1419b0bc8ca35781126744e60eae009
diff --git a/package/kernel/lantiq/ltq-adsl/Makefile 
b/package/kernel/lantiq/ltq-adsl/Makefile
index 1a9128fc58..b2e1ccb640 100644
--- a/package/kernel/lantiq/ltq-adsl/Makefile
+++ b/package/kernel/lantiq/ltq-adsl/Makefile
@@ -13,7 +13,7 @@ PKG_VERSION:=3.24.4.4
 PKG_RELEASE:=3
 PKG_SOURCE:=drv_dsl_cpe_api_danube-$(PKG_VERSION).tar.gz
 
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/ltq-dsl-$(BUILD_VARIANT)/drv_dsl_cpe_api-$(PKG_VERSION)
-PKG_SOURCE_URL:=https://mirror2.openwrt.org/sources/
+PKG_SOURCE_URL:=@OPENWRT
 PKG_HASH:=eb2ed59715d3bf4e8a1460bbbe2f1660039e0a9f9d72afb1b2b16590094eb33c
 PKG_MAINTAINER:=John Crispin 
 
diff --git a/pack

Re: [PATCH] treewide: unify OpenWrt hosted source URL

[Paul Spooren]

On Sun, Jan 31, 2021 at 10:08, Hannu Nyman  wrote:

Paul Spooren kirjoitti 30.1.2021 klo 23.54:
Multiple sources are hosted on OpenWrts source server only. The 
source
URLs to point to the server vary based on different epochs in 
OpenWrts

history. Unify them to use always the new source CDN and HTTPS.

If the CDN fails, sources.o.o is used as a fallback via downloads.pl.

Signed-off-by: Paul Spooren 
---
  package/boot/fconfig/Makefile | 2 +-
  package/firmware/b43legacy-firmware/Makefile  | 2 +-
  package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile | 2 +-
  package/kernel/broadcom-wl/Makefile   | 2 +-
  package/kernel/lantiq/ltq-adsl/Makefile   | 2 +-
  package/kernel/lantiq/ltq-tapi/Makefile   | 2 +-
  package/kernel/lantiq/ltq-vdsl-mei/Makefile   | 2 +-
  package/kernel/lantiq/ltq-vdsl/Makefile   | 2 +-
  package/kernel/lantiq/ltq-vmmc/Makefile   | 2 +-
  package/kernel/mac80211/broadcom.mk   | 6 
+++---

  package/network/config/ltq-adsl-app/Makefile  | 2 +-
  package/network/config/ltq-vdsl-app/Makefile  | 2 +-
  tools/lzma-old/Makefile   | 2 +-
  tools/lzma/Makefile   | 2 +-
  14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package/boot/fconfig/Makefile 
b/package/boot/fconfig/Makefile

index 9b806fe97c..31986e6942 100644
--- a/package/boot/fconfig/Makefile
+++ b/package/boot/fconfig/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=20080329
  PKG_RELEASE:=1
    PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://downloads.openwrt.org/sources
+PKG_SOURCE_URL:=https://sources.cdn.openwrt.org



Would it make sense to define a similar @OPENWRT alias in 
scripts/download.pl as we have done for SF, APACHE, GITHUB, GNU, 
SAVANNAH, KERNEL and GNOME ?


I had the same idea but thought it's awkward to define a variable which 
is then empty. I'll give it a try and see how it looks. We could then 
decide for either solution.




https://github.com/openwrt/openwrt/blob/master/scripts/download.pl#L192-L255

Then we could in future change those download locations centrally in 
download.pl, instead of changing it every single Makefile where it is 
used. The Makefiles could just contain PKG_SOURCE_URL:=@OPENWRT


(One afterthought: the pushed contents might actually be empty, as 
the actual download locations are pushed on lines 261-263 to the same 
trial queue. Not quite sure about the pushing order logic, but might 
work.)






___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCHv3 1/2] tools/zstd: update to 1.4.8

[Paul Spooren]

On Wed Jan 20, 2021 at 6:54 PM HST, Rosen Penev wrote:
> Switch to the normal tarball instead of the codeload generated one. The
> latter has the potential to change hashes based on changes in the repo.
>
> Signed-off-by: Rosen Penev 
> ---

Currently zstd fails to compile, is this meant s a fix or unrelated?

compress/zstd_compress.c:2129:1: error: conflicting types for 
'ZSTD_compressSequences'
 2129 | ZSTD_compressSequences(seqStore_t* seqStorePtr,
  | ^~
In file included from ./common/zstd_internal.h:27,
 from compress/zstd_compress_internal.h:21,
 from compress/zstd_compress.c:23:
/home/user/src/openwrt/openwrt/staging_dir/host/include/zstd.h:1370:20: note: 
previous declaration of 'ZSTD_compressSequences' was here
 1370 | ZSTDLIB_API size_t ZSTD_compressSequences(ZSTD_CCtx* const cctx, void* 
dst, size_t dstSize,
  |^~
compress/zstd_compress.c: In function 'ZSTD_copyBlockSequences':
compress/zstd_compress.c:2337:19: error: 'ZSTD_Sequence' has no member named 
'matchPos'
 2337 | outSeqs[i].matchPos = (unsigned int)position;
  |   ^

> v3: converted to use CMake
> v2: forgot to remove upstreamed patch
> tools/zstd/Makefile | 7 +--
> ...re-portable-header-prefix-usage-1987.patch | 61 ---
> 2 files changed, 3 insertions(+), 65 deletions(-)
> delete mode 100644
> tools/zstd/patches/0001-build-issue-More-portable-header-prefix-usage-1987.patch
>
> diff --git a/tools/zstd/Makefile b/tools/zstd/Makefile
> index 4ec910d4ba..1107c0d92c 100644
> --- a/tools/zstd/Makefile
> +++ b/tools/zstd/Makefile
> @@ -1,12 +1,11 @@
> include $(TOPDIR)/rules.mk
>  
> PKG_NAME:=zstd
> -PKG_VERSION:=1.4.4
> +PKG_VERSION:=1.4.8
>  
> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
> -PKG_SOURCE_URL_FILE:=v$(PKG_VERSION).tar.gz
> -PKG_SOURCE_URL:=https://github.com/facebook/zstd/archive/
> -PKG_HASH:=a364f5162c7d1a455cc915e8e3cf5f4bd8b75d09bc0f53965b0c9ca1383c52c8
> +PKG_SOURCE_URL:=https://github.com/facebook/zstd/releases/download/v$(PKG_VERSION)
> +PKG_HASH:=32478297ca1500211008d596276f5367c54198495cf677e9439f4791a4c69f24
>  
> PKG_LICENSE:=BSD-3-Clause
> PKG_LICENSE_FILES:=LICENSE
> diff --git
> a/tools/zstd/patches/0001-build-issue-More-portable-header-prefix-usage-1987.patch
> b/tools/zstd/patches/0001-build-issue-More-portable-header-prefix-usage-1987.patch
> deleted file mode 100644
> index 6d743aa385..00
> ---
> a/tools/zstd/patches/0001-build-issue-More-portable-header-prefix-usage-1987.patch
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -From 06a57cf57e3c4e887cadcf688e3081154f3f6db4 Mon Sep 17 00:00:00 2001
> -Message-Id:
> <06a57cf57e3c4e887cadcf688e3081154f3f6db4.1589392463.git.mschif...@universe-factory.net>
> -From: Bimba Shrestha 
> -Date: Thu, 6 Feb 2020 14:10:51 -0800
> -Subject: [PATCH] [build-issue] More portable header prefix usage (#)
> (#1987)
> -
> -* make 4.3 build issue fix
> -
> -* Changing header name and adding comment
> 
> - programs/Makefile | 11 +++
> - 1 file changed, 7 insertions(+), 4 deletions(-)
> -
> -diff --git a/programs/Makefile b/programs/Makefile
> -index b75314a83f43..a9ee3cb5311b 100644
>  a/programs/Makefile
> -+++ b/programs/Makefile
> -@@ -94,9 +94,12 @@ endif
> -
> - VOID = /dev/null
> -
> -+# Make 4.3 doesn't support '\#' anymore
> (https://lwn.net/Articles/810071/)
> -+NUM_SYMBOL := \#
> -+
> - # thread detection
> - NO_THREAD_MSG := ==> no threads, building without multithreading
> support
> --HAVE_PTHREAD := $(shell printf '\#include \nint main(void)
> { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT)
> have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 ||
> echo 0; rm have_pthread.c)
> -+HAVE_PTHREAD := $(shell printf '$(NUM_SYMBOL)include \nint
> main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o
> have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm
> have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c)
> - HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter
> Windows%,$(OS))" ] && echo 1 || echo 0)
> - ifeq ($(HAVE_THREAD), 1)
> - THREAD_MSG := ==> building with threading support
> -@@ -108,7 +111,7 @@ endif
> -
> - # zlib detection
> - NO_ZLIB_MSG := ==> no zlib, building zstd without .gz support
> --HAVE_ZLIB := $(shell printf '\#include \nint main(void) {
> return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT)
> have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm
> have_zlib.c)
> -+HAVE_ZLIB := $(shell printf '$(NUM_SYMBOL)include \nint
> main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o
> have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo
> 1 || echo 0; rm have_zlib.c)
> - ifeq ($(HAVE_ZLIB), 1)
> - ZLIB_MSG := ==> building zstd with .gz compression support
> - ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS
> -@@ -119,7 +122,7 @@ endif
> -
> - # lzma detection
> - 

Re: [PATCHv3 2/2] tools/zstd: compile with cmake

[Paul Spooren]

On Wed Jan 20, 2021 at 6:54 PM HST, Rosen Penev wrote:
> It's faster and more reliable.
>
> Removed ccache cmake build dependency as it's now implicit.
>
> Signed-off-by: Rosen Penev 
> ---
> v3: converted to use CMake
> tools/Makefile | 3 ++-
> tools/zstd/Makefile | 9 +++--
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/tools/Makefile b/tools/Makefile
> index 09fe340e6c..a2665dbc9a 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -72,6 +72,7 @@ $(curdir)/sdcc/compile := $(curdir)/bison/compile
> $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
> $(curdir)/squashfskit4/compile := $(curdir)/xz/compile
> $(curdir)/zlib/compile
> $(curdir)/zlib/compile := $(curdir)/cmake/compile
> +$(curdir)/zstd/compile := $(curdir)/cmake/compile
>  
> ifneq ($(HOST_OS),Linux)
> $(curdir)/squashfskit4/compile += $(curdir)/coreutils/compile
> @@ -81,7 +82,7 @@ endif
> ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),)
> $(foreach tool, $(filter-out xz zstd patch pkgconf libressl
> cmake,$(tools-y)), $(eval $(curdir)/$(tool)/compile +=
> $(curdir)/ccache/compile))
> tools-y += ccache
> -$(curdir)/ccache/compile := $(curdir)/cmake/compile
> $(curdir)/zstd/compile
> +$(curdir)/ccache/compile := $(curdir)/zstd/compile
> endif
>  
> # in case there is no patch tool on the host we need to make patch tool
> a
> diff --git a/tools/zstd/Makefile b/tools/zstd/Makefile
> index 1107c0d92c..a0106f15f2 100644
> --- a/tools/zstd/Makefile
> +++ b/tools/zstd/Makefile
> @@ -11,11 +11,16 @@ PKG_LICENSE:=BSD-3-Clause
> PKG_LICENSE_FILES:=LICENSE
> PKG_CPE_ID:=cpe:/a:facebook:zstandard
>  
> +CMAKE_SOURCE_SUBDIR:=build/cmake
> HOST_BUILD_PARALLEL:=1
>  
> include $(INCLUDE_DIR)/host-build.mk
> +include $(INCLUDE_DIR)/cmake.mk
>  
> -HOSTCC := $(HOSTCC_NOCACHE)
> -HOST_MAKE_FLAGS = PREFIX=$(HOST_BUILD_PREFIX) HAVE_ZLIB=0 HAVE_LZMA=0
> HAVE_LZ4=0
> +CMAKE_HOST_OPTIONS += \
> + -DBUILD_TESTING=OFF \
> + -DCMAKE_C_COMPILER_LAUNCHER="" \
> + -DCMAKE_C_COMPILER=$(HOSTCC_NOCACHE) \
> + -DZSTD_LEGACY_SUPPORT=OFF

These option changes look somewhat different, do they still result in
the same output?
>  
> $(eval $(call HostBuild))
> --
> 2.29.2
>
>
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] treewide: use CDN for downloads

[Paul Spooren]

Use CDN for opkg repositories.

Signed-off-by: Paul Spooren 
---
Tested with browser and opkg running on router.
HTTP works only for specific user-agents and `ipk` files, this is a
*limitation* (or security precaution) of the origin server not
influenced by the CDN.

 include/version.mk | 2 +-
 package/base-files/image-config.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/version.mk b/include/version.mk
index b7f42e13bb..e38d22bcd4 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -32,7 +32,7 @@ VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
 VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if 
$(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/snapshots)
+VERSION_REPO:=$(if 
$(VERSION_REPO),$(VERSION_REPO),https://downloads.cdn.openwrt.org/snapshots)
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
diff --git a/package/base-files/image-config.in 
b/package/base-files/image-config.in
index bfa3055cc8..71de5fd59f 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -183,7 +183,7 @@ if VERSIONOPT
config VERSION_REPO
string
prompt "Release repository"
-   default "https://downloads.openwrt.org/snapshots;
+   default "https://downloads.cdn.openwrt.org/snapshots;
help
This is the repository address embedded in the image, 
it defaults
to the trunk snapshot repo; the url may contain the 
following placeholders:
-- 
2.29.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] treewide: unify OpenWrt hosted source URL

[Paul Spooren]

Multiple sources are hosted on OpenWrts source server only. The source
URLs to point to the server vary based on different epochs in OpenWrts
history. Unify them to use always the new source CDN and HTTPS.

If the CDN fails, sources.o.o is used as a fallback via downloads.pl.

Signed-off-by: Paul Spooren 
---
 package/boot/fconfig/Makefile | 2 +-
 package/firmware/b43legacy-firmware/Makefile  | 2 +-
 package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile | 2 +-
 package/kernel/broadcom-wl/Makefile   | 2 +-
 package/kernel/lantiq/ltq-adsl/Makefile   | 2 +-
 package/kernel/lantiq/ltq-tapi/Makefile   | 2 +-
 package/kernel/lantiq/ltq-vdsl-mei/Makefile   | 2 +-
 package/kernel/lantiq/ltq-vdsl/Makefile   | 2 +-
 package/kernel/lantiq/ltq-vmmc/Makefile   | 2 +-
 package/kernel/mac80211/broadcom.mk   | 6 +++---
 package/network/config/ltq-adsl-app/Makefile  | 2 +-
 package/network/config/ltq-vdsl-app/Makefile  | 2 +-
 tools/lzma-old/Makefile   | 2 +-
 tools/lzma/Makefile   | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package/boot/fconfig/Makefile b/package/boot/fconfig/Makefile
index 9b806fe97c..31986e6942 100644
--- a/package/boot/fconfig/Makefile
+++ b/package/boot/fconfig/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=20080329
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://downloads.openwrt.org/sources
+PKG_SOURCE_URL:=https://sources.cdn.openwrt.org
 PKG_HASH:=4ff0e8f07e35e46b705c0dbe9d9544ede01ea092a69e3f7db03e55a3f2bb8eb7
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
diff --git a/package/firmware/b43legacy-firmware/Makefile 
b/package/firmware/b43legacy-firmware/Makefile
index 9b9c0070b2..0108c2a169 100644
--- a/package/firmware/b43legacy-firmware/Makefile
+++ b/package/firmware/b43legacy-firmware/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=3.130.20.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=wl_apsta-$(PKG_VERSION).o
-PKG_SOURCE_URL:=https://downloads.openwrt.org/sources
+PKG_SOURCE_URL:=https://sources.cdn.openwrt.org
 PKG_HASH:=7dba610b1d96dd14e901bcbce14cd6ecd1b1ac6f5c0035b0d6b6dc46a7c3ef90
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile 
b/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile
index a076fe2596..781c85ec87 100644
--- a/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile
+++ b/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile
@@ -10,7 +10,7 @@ PKG_NAME:=dsl_vr9_firmware_xdsl
 PKG_VERSION:=05.08.01.08.01.06_05.08.00.0B.01.01_osc
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
+PKG_SOURCE_URL:=https://sources.cdn.openwrt.org
 PKG_HASH:=44cd94130571fe42dfa8f0f9d44597d104e9e77962617fe38646b7a0b4184a2b
 PKG_BUILD_DEPENDS:=bsdiff/host
 
diff --git a/package/kernel/broadcom-wl/Makefile 
b/package/kernel/broadcom-wl/Makefile
index 661c7f0589..8774b64dc0 100644
--- a/package/kernel/broadcom-wl/Makefile
+++ b/package/kernel/broadcom-wl/Makefile
@@ -13,7 +13,7 @@ PKG_VERSION:=5.10.56.27.3
 PKG_RELEASE:=10
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(ARCH).tar.bz2
-PKG_SOURCE_URL:=https://downloads.openwrt.org/sources
+PKG_SOURCE_URL:=https://sources.cdn.openwrt.org
 
 ifeq ($(ARCH),mipsel)
 PKG_HASH:=26a8c370f48fc129d0731cfd751c36cae1419b0bc8ca35781126744e60eae009
diff --git a/package/kernel/lantiq/ltq-adsl/Makefile 
b/package/kernel/lantiq/ltq-adsl/Makefile
index 1a9128fc58..e7cd23f48a 100644
--- a/package/kernel/lantiq/ltq-adsl/Makefile
+++ b/package/kernel/lantiq/ltq-adsl/Makefile
@@ -13,7 +13,7 @@ PKG_VERSION:=3.24.4.4
 PKG_RELEASE:=3
 PKG_SOURCE:=drv_dsl_cpe_api_danube-$(PKG_VERSION).tar.gz
 
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/ltq-dsl-$(BUILD_VARIANT)/drv_dsl_cpe_api-$(PKG_VERSION)
-PKG_SOURCE_URL:=https://mirror2.openwrt.org/sources/
+PKG_SOURCE_URL:=https://sources.cdn.openwrt.org
 PKG_HASH:=eb2ed59715d3bf4e8a1460bbbe2f1660039e0a9f9d72afb1b2b16590094eb33c
 PKG_MAINTAINER:=John Crispin 
 
diff --git a/package/kernel/lantiq/ltq-tapi/Makefile 
b/package/kernel/lantiq/ltq-tapi/Makefile
index 072041c589..f364dca723 100644
--- a/package/kernel/lantiq/ltq-tapi/Makefile
+++ b/package/kernel/lantiq/ltq-tapi/Makefile
@@ -13,7 +13,7 @@ PKG_VERSION:=3.13.0
 PKG_RELEASE:=4
 
 PKG_SOURCE:=drv_tapi-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
+PKG_SOURCE_URL:=https://sources.cdn.openwrt.org
 PKG_HASH:=109374d52872716570fca3fef3b93c9a93159a804dfd42484b19152b825af5c0
 PKG_MAINTAINER:=John Crispin 
 
diff --git a/package/kernel/lantiq/ltq-vdsl-mei/Makefile 
b/package/kernel/lantiq/ltq-vdsl-mei/Makefile
index 5d15f2650b..82c779daa0 100644
--- a/package/kernel/lantiq/ltq-vdsl-mei/Makefile
+++ b/package/kernel/lantiq/ltq-vdsl-mei/Makefile
@@ -14,7

[PATCH] build,package-defaults: AUTORELEASE as fallback

[Paul Spooren]

This commits changes the package defaults so that $(AUTORELEASE) is used
whenever no explicit PKG_RELEASE is set and $(COMMITCOUNT) whenever
neither is given.

Previously an explicit definition of PKG_RELEASE=$(AUTORELEASE) would be
required.

Signed-off-by: Paul Spooren 
---
 include/package-defaults.mk | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 2a04bc17e9..de3f07bb25 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -28,10 +28,14 @@ define Package/Default
 ifneq ($(PKG_RELEASE),)
   VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
 else
-  VERSION:=$(PKG_VERSION)
+  VERSION:=$(PKG_VERSION)-$(AUTORELEASE)
 endif
   else
-VERSION:=$(PKG_RELEASE)
+ifneq ($(PKG_RELEASE),)
+  VERSION:=$(PKG_RELEASE)
+else
+  VERSION:=$(COMMITCOUNT)
+endif
   endif
   ABI_VERSION:=
   ifneq ($(PKG_FLAGS),)
-- 
2.29.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] rules: fix empty COMMITCOUNT/AUTORELEASE

[Paul Spooren]

On Fri, Jan 29, 2021 at 10:43, Petr Štetiar  wrote:
I guess, that the actual error from that dump.txt file would be more 
useful in

this case :)


Sorry, it was late:
Makefile:48: *** Package/px5g-wolfssl is missing the VERSION field. 
Stop.


VERSION is defined as PKG_VERSION-PKG_RELEASE, or whatever of both is 
there. In the case of px5g-wolfssl neither was available.




___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] rules: fix empty COMMITCOUNT/AUTORELEASE

[Paul Spooren]

Packages that are in-tree only often lack a PKG_VERSION and only use the
PKG_RELEASE to mark changes. Using COMMITCOUNT/AUTORELEASE variables
causes an issue as both variables are empty during the metadata DUMP
phase.

Instead of leaving these variables empty and causing an error message
like below, set the variables to 0 during dumping. On actual building
the variable is evaluated causing in a value above 0.

ERROR: please fix package/utils/px5g-wolfssl/Makefile - \
see logs/package/utils/px5g-wolfssl/dump.txt for details

Reported-by: Borromini @ IRC
Reported-by: Daniel Golle 
Signed-off-by: Paul Spooren 
---
 rules.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules.mk b/rules.mk
index 1b63b8fc45..fc2c2efa2d 100644
--- a/rules.mk
+++ b/rules.mk
@@ -432,8 +432,8 @@ $(shell \
 )
 endef
 
-COMMITCOUNT = $(if $(DUMP),,$(call commitcount))
-AUTORELEASE = $(if $(DUMP),,$(call commitcount,1))
+COMMITCOUNT = $(if $(DUMP),0,$(call commitcount))
+AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1))
 
 all:
 FORCE: ;
-- 
2.29.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [PATCH] umdns: bump to 2021-01-26

[Paul Spooren]

On Wed, Jan 27, 2021 at 22:37, Petr Štetiar  wrote:

Can't this be a default which could be overriden when needed?


Sure, see patch below. As it's a new feature I wanted it optionally 
rather than treewide for the beginning.


I'll send a patch.



___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] scripts: sources CDN as fallback in download.pl

[Paul Spooren]

In case the default sources for a package fail use the CDN rather than
our own mirror. In case the CDN fails, fallback to our mirror.

Also remove mirror1 which isn't available anymore.

Signed-off-by: Paul Spooren 
---
 scripts/download.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/download.pl b/scripts/download.pl
index 84d10dbe5f..61af0a0429 100755
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -258,7 +258,7 @@ foreach my $mirror (@ARGV) {
}
 }
 
-#push @mirrors, 'https://mirror1.openwrt.org';
+push @mirrors, 'https://sources.cdn.openwrt.org';
 push @mirrors, 'https://sources.openwrt.org';
 push @mirrors, 'https://mirror2.openwrt.org/sources';
 
-- 
2.29.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] umdns: bump to 2021-01-26

[Paul Spooren]

* i78aa36b umdns: fix 64-bit time format string
* start using $(AUTORELEASE)
* Update Copyright

Signed-off-by: Paul Spooren 
---
 package/network/services/umdns/Makefile | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/network/services/umdns/Makefile 
b/package/network/services/umdns/Makefile
index 41945ce007..a405dad0e8 100644
--- a/package/network/services/umdns/Makefile
+++ b/package/network/services/umdns/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2021 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umdns
-PKG_RELEASE:=4
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/mdnsd.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2020-10-26
-PKG_SOURCE_VERSION:=59e4fc98162d253b4e5ecd110f7bc5ea3962e221
+PKG_SOURCE_DATE:=2021-01-26
+PKG_SOURCE_VERSION:=78aa36b0e9808e801c527c6dc47320e593309522
 
PKG_MIRROR_HASH:=35fefc76d84c963ccb0aa72ac738065649f361d2946d3bc45fbd205d1dfc3d9f
 
 PKG_MAINTAINER:=John Crispin 
-- 
2.29.2


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: Job board support on openwrt.org?

[Paul Spooren]

On Sun, Jan 24, 2021 at 00:16, Sam Kuper  
wrote:

On Sat, Jan 23, 2021 at 06:57:53PM -0500, Etienne Champetier wrote:

 Le sam. 23 janv. 2021 à 18:09, Sam Kuper a écrit :

 I suggest that if a vote is held, it should be a three-way vote
 between the following outcomes (which should probably be mutually
 exclusive):

 - OpenWRT Jobs wiki page;

 - openwrt-jobs mailing list;


 - OpenWrt Jobs forum section, with a "non endorsement" disclaimer at
   the top


 - Do nothing.


Thanks, fair point.  I forgot the forum.  (I mostly avoid Discourse.)

So, a vote between four possible outcomes.


I "revert" my agreement with a curated wiki entry and much prefer an 
open "jobs" list where everyone can subscribe and whoever post job 
offers.


The list could be moderated in a way that only job-offers are allowed 
while sending resumes is blocked to limit noise.




--
A: When it messes up the order in which people normally read text.
Q: When is top-posting a bad thing?

()  ASCII ribbon campaign. Please avoid HTML emails & proprietary
/\  file formats. (Why? See e.g. https://v.gd/jrmGbS ). Thank you.

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel




___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: Job board support on openwrt.org?

[Paul Spooren]

On Sa, Jan 23, 2021 at 07:25, Alberto Bursi  
wrote:



On 22/01/21 20:03, Daniel Golle wrote:

Hi Philip,

On Fri, Jan 22, 2021 at 11:23:42AM -0700, Philip Prindeville wrote:

Hi,

Is anyone interested in adding a page to the openwrt.org site about 
developers willing to do commercial work?


It could be as simple as:

* name
* email address
* mobile (if wanted)
* packages/platforms/architectures you maintain or have competence 
in
* whether you're available full-time, part-time, or currently 
unavailable


Might be useful for matching up devs with work.


While I like the idea and would probably benefit from it myself, I'm
a bit sceptical when it comes to making OpenWrt.org an institution
certifying developers. Too much trouble was caused over having
'@openwrt.org' addresses and I doubt we are able to handle the
moderation needs (think: classic fraud, fishing, ...) of such a thing
if it is even a wiki, ie. free to edit for all.


the site/wiki has user-restricted pages already (the front page, the 
releases page and personal developer pages I think, probably more) 
because otherwise it would be a field day for spambots.
So this would not be a "free to edit for all", and more of a "ask a 
wiki admin to add your data to the page".
I and Tmomas won't be able to do a through vetting process on 
anybody, but we are more than enough to stop basic spammers and such, 
and can also respond to complaints and remove somebody in case issues 
arise later.
I'm also thinking about having some rules of thumb to limit access to 
people that have actually been involved in OpenWrt for a bit and can 
prove it (some relevant commits, some useful mail in the list, a core 
developer vouching for them, whatever).


-Alberto


I'm generally pro this but before this gets implemented (and after 
sufficiently discussed) please start a vote.




Things like a wiki with only volunteer moderation somehow work 
because

there is little to no commercial interest in manipulation and it is
usually easy to recognize (ie. classic spam). In the moment that we
change that, we have to be prepared to also face a different quality
of manipulation attempts.

Just my 2 cents...



Just an idea to help our community prosper.

Thanks,

-Philip


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel



___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel




___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: OpenWrt 19.07.6 service release

[Paul Spooren]

What's the size difference here. I'd be curious to replace dnsmasq for 
the default setup, but only if it brings an advantage in size and 
security.


Just a personal interest.

Best,
Paul
--



Jan 22, 2021 11:44:50 AM Philip Prindeville 
:





On Jan 22, 2021, at 12:00 PM, Alberto Bursi 

 wrote:




On 22/01/21 19:53, Philip Prindeville wrote:
As an alternative to dnsmasq, master now has isc-dhcp (v4 only) and 
Bind integration, so that's getting close to the essential functionality 
that dnsmasq provides.
I stopped using dnsmasq about 8 years ago because it has several 
minor violations of the RFC's (which the Kelly's claim are convenient and 
therefore justified) but I believe create potential incompatibilities for 
specious reasons (yes, I'm a strict-interpretation-of-the-standards 
nazi).


How do I enable/use the "isc-dhcp (v4 only) and Bind integration" and 

replace/disable dnsmasq?


-Alberto




You'll need to remove the dnsmasq package and select 
CONFIG_PACKAGE_isc-dhcp-server-ipv4 (or -ipv6 which actually supports 
both IPv4 and IPv6, but the UCI scripting for dynDNS for IPv6 as I said 
is missing).  That will bring in Bind and the related tools.


To the top of your /etc/config/dhcp you'll need to add:

config isc_dhcpd 'isc_dhcpd'
    option authoritative '1'
    option default_lease_time '3600'
    option max_lease_time '86400'
    option always_broadcast 0
    option boot_unknown_clients 1
    option log_facility 'daemon'
    option domain 'example.com'
    option dynamicdns 1

Which are the ISC specific global options.  The last line is the one 

that enables dynamic DNS internally.


To the subnet sections like:

config dhcp 'lan'
    option interface 'lan'
    option leasetime '12h'
    option start '128'
    option limit '32'
    list dhcp_option 

'option:ntp-servers,192.168.1.40,192.168.1.252'


You can call out specific DHCP options (per dhcp-options(5)) with 

something like the last line.



For statically configured hosts that you want DNS records for, use:

config domain
  option ip '192.168.1.2'
  option name 'myserver'

Other record types:

config cname
  option cname 'mail'
  option target 'www'

config cname
  option cname 'ftp'
  option target 'www'

config srvhost
    option srv '_sip._udp'
    option target 'pbx'
    option port '5060'
    option priority '0'
    option weight '10'

config mxhost
    option domain '@'
    option relay 'mail'
    option pref '10'

etc.

Hope that helps.  Send an email if you have more questions.

-Philip



If anyone is interested in having v6 support to DHCP+Bind 

integration, I can look at doing that as well.

Thanks,
-Philip
On Jan 19, 2021, at 3:56 PM, Hauke Mehrtens  

wrote:


Hi,

The OpenWrt community is proud to announce the sixth service release 

of OpenWrt 19.07. It focuses on fixing several security issues.


Main changes from OpenWrt 19.07.5

Security fixes
* Security Advisory 2021-01-19-1 - dnsmasq multiple vulnerabilities
(CVE-2020-25681, CVE-2020-25682, CVE-2020-25683, CVE-2020-25687,
  CVE-2020-25684, CVE-2020-25685 and CVE-2020-25686)
* openssl: NULL pointer deref in GENERAL_NAME_cmp function can lead 

to

a DOS attack. (CVE-2020-1971)

Note: security fixes for most packages can also be applied by 
upgrading only the affected packages on running devices, without the need 
for a full firmware upgrade. This can be done with opkg update; opkg 
upgrade the_package_name or through the LuCI web interface.


Nevertheless, we encourage all users to upgrade their devices to 

OpenWrt 19.07.6 or later versions whenever possible.


Major bug fixes
* Fix iOS 14 tethering problem

Device support
* Enable LED VCC for Asus RT-AC51U

LuCI web interface
* luci-mod-system: properly handle SSH pubkeys with options 

(GH#4684)

* luci-mod-network: properly handle wireless netdevs when creating
interfaces
* Update translations from weblate

Core components
* Update Linux kernel from 4.14.209 to 4.14.215
* Update mac80211 and wifi drivers from 4.19.137-1 to 4.19.161-1
* Update wireless-regdb from 2019.06.03 to 2020.11.20
* Update mbedtls from 2.16.8 to 2.16.9
* Update openssl from 1.1.1h to 1.1.1i

Full release notes and upgrade instructions are available at
https://openwrt.org/releases/19.07/notes-19.07.6

In particular, make sure to read the regressions and known issues 

before upgrading:

https://openwrt.org/releases/19.07/notes-19.07.6#regressions

For a very detailed list of all changes since 19.07.5, refer to
https://openwrt.org/releases/19.07/changelog-19.07.6

- ---

To stay informed of new OpenWrt releases and security advisories, 

there

are new channels available:

* a low-volume mailing list for important announcements: 

https://lists.openwrt.org/mailman/listinfo/openwrt-announce


* a dedicated "announcements" section in the forum: 

https://forum.openwrt.org/c/announcements/14


* other announcement channels (such as RSS feeds) might be 

Re: [RFC PATCH] ath79: remove generic profiles

[Paul Spooren]

On Thu Jan 21, 2021 at 9:42 AM HST, Adrian Schmutzler wrote:
> On a platform with many very different devices, like found on ath79,
> the generic profiles seem like remnants of the past that do not
> have a real use anymore.
>
> Remove them to have one thing less to maintain.
>
> Signed-off-by: Adrian Schmutzler 
> ---

Looks good to me. A quick check of target-metadata.pl reveals that the
buildbot enables all profiles per default, so a shortcut via the generic
"profile" isn't required on that end.

>From my view, please proceed with other targets.

Acked-by: Paul Spooren 

>
> This might also apply to other similar targets like ramips if it
> will receive positive feedback.
>
> ---
> .../linux/ath79/generic/profiles/00-default.mk | 16 
> .../ath79/mikrotik/profiles/00-default.mk | 18 --
> target/linux/ath79/nand/profiles/00-default.mk | 18 --
> target/linux/ath79/tiny/profiles/00-default.mk | 9 -
> 4 files changed, 61 deletions(-)
> delete mode 100644 target/linux/ath79/generic/profiles/00-default.mk
> delete mode 100644 target/linux/ath79/mikrotik/profiles/00-default.mk
> delete mode 100644 target/linux/ath79/nand/profiles/00-default.mk
> delete mode 100644 target/linux/ath79/tiny/profiles/00-default.mk
>
> diff --git a/target/linux/ath79/generic/profiles/00-default.mk
> b/target/linux/ath79/generic/profiles/00-default.mk
> deleted file mode 100644
> index 83b39e4418..00
> --- a/target/linux/ath79/generic/profiles/00-default.mk
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -#
> -# Copyright (C) 2009 OpenWrt.org
> -#
> -# This is free software, licensed under the GNU General Public License
> v2.
> -# See /LICENSE for more information.
> -#
> -
> -define Profile/Default
> - NAME:=Default Profile (all drivers)
> - PRIORITY := 1
> -endef
> -
> -define Profile/Default/Description
> - Default package set compatible with most boards.
> -endef
> -$(eval $(call Profile,Default))
> diff --git a/target/linux/ath79/mikrotik/profiles/00-default.mk
> b/target/linux/ath79/mikrotik/profiles/00-default.mk
> deleted file mode 100644
> index 14712da593..00
> --- a/target/linux/ath79/mikrotik/profiles/00-default.mk
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -#
> -# Copyright (C) 2020 OpenWrt.org
> -#
> -# This is free software, licensed under the GNU General Public License
> v2.
> -# See /LICENSE for more information.
> -#
> -
> -define Profile/Default
> - NAME:=Default Profile (all drivers)
> - PACKAGES:= \
> - kmod-usb-ohci kmod-usb2 nand-utils
> - PRIORITY := 1
> -endef
> -
> -define Profile/Default/Description
> - Default package set compatible with most boards.
> -endef
> -$(eval $(call Profile,Default))
> diff --git a/target/linux/ath79/nand/profiles/00-default.mk
> b/target/linux/ath79/nand/profiles/00-default.mk
> deleted file mode 100644
> index 6e618113a5..00
> --- a/target/linux/ath79/nand/profiles/00-default.mk
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -#
> -# Copyright (C) 2009 OpenWrt.org
> -#
> -# This is free software, licensed under the GNU General Public License
> v2.
> -# See /LICENSE for more information.
> -#
> -
> -define Profile/Default
> - NAME:=Default Profile
> - PACKAGES:= \
> - kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport
> - PRIORITY := 1
> -endef
> -
> -define Profile/Default/Description
> - Default package set compatible with most boards.
> -endef
> -$(eval $(call Profile,Default))
> diff --git a/target/linux/ath79/tiny/profiles/00-default.mk
> b/target/linux/ath79/tiny/profiles/00-default.mk
> deleted file mode 100644
> index aa8e1195f8..00
> --- a/target/linux/ath79/tiny/profiles/00-default.mk
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -define Profile/Default
> - NAME:=Default Profile (all drivers)
> - PRIORITY := 1
> -endef
> -
> -define Profile/Default/Description
> - Default package set compatible with most boards.
> -endef
> -$(eval $(call Profile,Default))
> --
> 2.20.1
>
>
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel