bump to OpenWrt 23.05.0 (#35)

upgrade docker base image examples: -remove removed no longer existing ksmdb-utils -remove luci-app-wireguard since it was merged into luci-proto-wireguard
jandelgado · Nov 5, 2023 · 6bcaafe · 6bcaafe
1 parent 0f637ea
commit 6bcaafe
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 21 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     name: linting
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: shellcheck
         run: shellcheck builder.sh
   testnix:
@@ -21,7 +21,7 @@ jobs:
         example: ["x86_64", "rpi4", "glinet-gl-ar750", "glinet-gl-mt300n-v2", "nexx-wt3020", "rpi2", "wrt1043nd"]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: test build example
         run: |
           sh <(curl -L https://nixos.org/nix/install) --no-daemon
@@ -41,7 +41,7 @@ jobs:
         sudo: ["", "--sudo"]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: test build example
         run: |
           if [ "${{ matrix.option }}" == "--podman" ]; then

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog for lede-dockerbuilder
 
+## v3.5 [2923-11-05]
+
+* Upgrade to OpenWrt 23.05.0 & make examples run again
+* Ugrade docker base image
+
 ## v3.4 [2023-04-19]
 
 * Upgrade to OpenWrt 22.03.4

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ for your embedded device or a Raspberry PI) using a self-contained docker
 container or a [nix-shell](https://nixos.wiki/wiki/Development_environment_with_nix-shell) and the [OpenWrt image
 builder](https://openwrt.org/docs/guide-user/additional-software/imagebuilder).
 On the builder host, Docker, podman/buildah (for dockerless operation) or nix-shell is the
-only requirement. Supports latest OpenWrt release (22.03.4).
+only requirement. Supports latest OpenWrt release (23.05.0).
 
 ### Note
 
@@ -187,7 +187,7 @@ encrypted USB disk attached so I can use it as a simple NAS with samba and ftp:
 ```
 # LEDE profile to use: NEXX WT3020
 LEDE_PROFILE=nexx_wt3020-8m
-LEDE_RELEASE=22.03.4
+LEDE_RELEASE=23.05.0
 LEDE_TARGET=ramips
 LEDE_SUBTARGET=mt7620
 
@@ -196,7 +196,7 @@ LEDE_SUBTARGET=mt7620
 # include all packages to build a mobile NAS supporting disk encryption:
 # ksmbd (samba4 is too large now for the WT3020's 8MB), cryptsetup.
 # see https://github.com/namjaejeon/ksmbd-tools for ksmbd info.
-LEDE_PACKAGES="ksmbd-server ksmbd-utils lsblk block-mount\
+LEDE_PACKAGES="ksmbd-server lsblk block-mount\
     kmod-usb-storage-uas kmod-scsi-core ntfs-3g\
     kmod-nls-iso8859-1 cryptsetup kmod-crypto-xts\
     kmod-mt76 kmod-usb2 kmod-usb-ohci kmod-usb-core kmod-dm kmod-crypto-ecb\
@@ -300,7 +300,7 @@ a virtual router/firewall.
 
 First build the image with `builder.sh build example-x86_64.conf`, then unpack
 the resulting image with e.g. `gunzip
-output/openwrt-22.03.4-x86-64-generic-ext4-combined.img.gz`.  Finally the image
+output/openwrt-23.05.0-x86-64-generic-ext4-combined.img.gz`.  Finally the image
 can be started with qemu (or simply use [run_in_qemu.sh](etc/run_in_qemu.sh))
 
 ```shell

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,15 +1,17 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04 as base
 LABEL maintainer "Jan Delgado <[email protected]>"
 
 RUN    apt-get update\
     && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential\
          libncurses5-dev libncursesw5-dev zlib1g-dev gawk git gettext libssl-dev\
-         xsltproc rsync wget unzip python3\
+         xsltproc rsync wget unzip python3 python3-distutils file\
     && rm -rf /var/lib/apt/lists/*
 
 ADD etc/entrypoint.sh /usr/local/bin/
 RUN chmod 755 /usr/local/bin/entrypoint.sh 
 
+FROM base
+
 # install the image builder. use tmpfile so that tar's compression
 # autodetection works.
 ARG BUILDER_URL

diff --git a/example-glinet-gl-ar750.conf b/example-glinet-gl-ar750.conf
@@ -1,20 +1,20 @@
 # LEDE profile to use: GL.iNet GL-AR750
 LEDE_PROFILE=glinet_gl-ar750
-LEDE_RELEASE=22.03.4
+LEDE_RELEASE=23.05.0
 LEDE_TARGET=ath79
 LEDE_SUBTARGET=generic
 
 # list packages to include in LEDE image. prepend packages to deinstall with "-".
 LEDE_PACKAGES="-ath10k-firmware-qca9887-ct ath10k-firmware-qca9887-ct-full-htt \
-    ksmbd-server ksmbd-utils hd-idle luci-app-hd-idle diffutils\
+    ksmbd-server hd-idle luci-app-hd-idle diffutils\
     kmod-usb-storage-uas kmod-scsi-core kmod-fs-ext4 ntfs-3g\
     kmod-nls-cp437 kmod-nls-iso8859-1 vsftpd cryptsetup kmod-crypto-xts\
     kmod-mt76 kmod-usb2 kmod-usb-ohci kmod-usb-core usbutils\
     block-mount kmod-dm kmod-crypto-ecb \
     kmod-crypto-misc kmod-crypto-cbc kmod-crypto-crc32c kmod-crypto-hash\
     kmod-crypto-user iwinfo dropbear \
     -ppp -kmod-ppp -kmod-pppoe -kmod-pppox -ppp-mod-pppoe nmap tcpdump\
-    kmod-wireguard luci-app-wireguard luci-proto-wireguard wireguard-tools\
+    kmod-wireguard luci-proto-wireguard wireguard-tools\
     luci-ssl lsblk adblock luci-app-adblock"
 
 LEDE_DISABLED_SERVICES=""
diff --git a/example-glinet-gl-mt300n-v2.conf b/example-glinet-gl-mt300n-v2.conf
@@ -1,14 +1,14 @@
 # profile to use: GL.iNet GL-MT300N V2
 LEDE_PROFILE=glinet_gl-mt300n-v2
-LEDE_RELEASE=22.03.4
+LEDE_RELEASE=23.05.0
 LEDE_TARGET=ramips
 LEDE_SUBTARGET=mt76x8
 
 # list packages to include in LEDE image. prepend packages to deinstall with "-".
 # include all packages to build a mobile NAS supporting disk encryption: 
 # luci, ksmbd, vsftp, cryptsetup and some tools
 # 
-LEDE_PACKAGES="ksmbd-server ksmbd-utils vsftpd cryptsetup usbutils \
+LEDE_PACKAGES="ksmbd-server vsftpd cryptsetup usbutils \
     block-mount lsblk iwinfo tcpdump luci-ssl\
     kmod-usb-storage-uas kmod-scsi-core kmod-fs-ext4 ntfs-3g\
     kmod-nls-cp437 kmod-nls-iso8859-1 kmod-crypto-xts kmod-usb-ohci kmod-usb2\

diff --git a/example-nexx-wt3020.conf b/example-nexx-wt3020.conf
@@ -1,6 +1,6 @@
 # LEDE profile to use: NEXX WT3020
 LEDE_PROFILE=nexx_wt3020-8m
-LEDE_RELEASE=22.03.4
+LEDE_RELEASE=23.05.0
 LEDE_TARGET=ramips
 LEDE_SUBTARGET=mt7620
 
@@ -9,7 +9,7 @@ LEDE_SUBTARGET=mt7620
 # include all packages to build a mobile NAS supporting disk encryption:
 # ksmbd (samba4 is too large now for the WT3020's 8MB), cryptsetup.
 # see https://github.com/namjaejeon/ksmbd-tools for ksmbd info.
-LEDE_PACKAGES="ksmbd-server ksmbd-utils lsblk block-mount\
+LEDE_PACKAGES="ksmbd-server lsblk block-mount\
     kmod-usb-storage-uas kmod-scsi-core ntfs-3g\
     kmod-nls-iso8859-1 cryptsetup kmod-crypto-xts\
     kmod-mt76 kmod-usb2 kmod-usb-ohci kmod-usb-core kmod-dm kmod-crypto-ecb\

diff --git a/example-rpi2.conf b/example-rpi2.conf
@@ -1,5 +1,5 @@
 LEDE_PROFILE=rpi-2
-LEDE_RELEASE=22.03.4
+LEDE_RELEASE=23.05.0
 LEDE_TARGET=bcm27xx
 LEDE_SUBTARGET=bcm2709
 

diff --git a/example-rpi4.conf b/example-rpi4.conf
@@ -1,6 +1,6 @@
 # Demo for Raspberry 4.
 LEDE_PROFILE=rpi-4
-LEDE_RELEASE=22.03.4
+LEDE_RELEASE=23.05.0
 LEDE_TARGET=bcm27xx
 LEDE_SUBTARGET=bcm2711
 

diff --git a/example-wrt1043nd.conf b/example-wrt1043nd.conf
@@ -1,7 +1,7 @@
 # OpenWRT profile to use: tp link WR1043ND
 LEDE_PROFILE=tplink_tl-wr1043nd-v2
 LEDE_TARGET=ath79
-LEDE_RELEASE=22.03.4
+LEDE_RELEASE=23.05.0
 LEDE_SUBTARGET=generic
 
 # list packages to include in the image. prepend packages to deinstall with "-".

diff --git a/example-x86_64.conf b/example-x86_64.conf
@@ -2,7 +2,7 @@
 # See README.md for info on running this image with QEMU.
 #
 LEDE_PROFILE=generic
-LEDE_RELEASE=22.03.4
+LEDE_RELEASE=23.05.0
 LEDE_TARGET=x86
 LEDE_SUBTARGET=64
 

diff --git a/shell.nix b/shell.nix
@@ -2,6 +2,7 @@ with (import <nixpkgs> {});
 mkShell {
   name = "OpenWRT builder";
   buildInputs = [
+      pkgs.cacert
       git
       perl
       gnumake
@@ -15,7 +16,7 @@ mkShell {
       file
       subversion
       which
-      pkgconfig
+      pkg-config
       openssl
       systemd
       binutils