From 54546f873e8cf476685fdd3394871450903cb32f Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Mon, 15 May 2023 12:41:14 +0300 Subject: [PATCH 01/17] dent-artifacts: Update submodule Include latest petunia image and fix for broken symlink Add packages: - mstpd - ifupdown2 - python3-pyroute2 Signed-off-by: Taras Chornyi --- sm/dent-artifacts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sm/dent-artifacts b/sm/dent-artifacts index 81652960c..e7abfd985 160000 --- a/sm/dent-artifacts +++ b/sm/dent-artifacts @@ -1 +1 @@ -Subproject commit 81652960cb51988bf1c8920f2b3dfc120e12df32 +Subproject commit e7abfd985bc061ee8a72aff5d4636b80ffebe3c0 From 0cbe66537f785b839ab62f2e270d17d312fa5ae1 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Mon, 15 May 2023 18:17:54 +0300 Subject: [PATCH 02/17] Add switchdev-online service to hold off on network init based on 1d553a924463a6e25eabb10e70b90b367346987e Signed-off-by: Taras Chornyi --- .../switchdev-online.conf | 2 ++ .../systemd/system/switchdev-online@.service | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 builds/any/rootfs/buster/common/overlay/etc/systemd/system/networking.service.d/switchdev-online.conf create mode 100644 builds/any/rootfs/buster/common/overlay/etc/systemd/system/switchdev-online@.service diff --git a/builds/any/rootfs/buster/common/overlay/etc/systemd/system/networking.service.d/switchdev-online.conf b/builds/any/rootfs/buster/common/overlay/etc/systemd/system/networking.service.d/switchdev-online.conf new file mode 100644 index 000000000..4e9b7d40d --- /dev/null +++ b/builds/any/rootfs/buster/common/overlay/etc/systemd/system/networking.service.d/switchdev-online.conf @@ -0,0 +1,2 @@ +[Unit] +After=network-pre.target diff --git a/builds/any/rootfs/buster/common/overlay/etc/systemd/system/switchdev-online@.service b/builds/any/rootfs/buster/common/overlay/etc/systemd/system/switchdev-online@.service new file mode 100644 index 000000000..1b786ffe0 --- /dev/null +++ b/builds/any/rootfs/buster/common/overlay/etc/systemd/system/switchdev-online@.service @@ -0,0 +1,20 @@ +[Unit] +Description=Online state for switchdev device %i + +# See e.g. +# https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/ +Wants=network-pre.target +Before=network-pre.target + +# this is the naming scheme currently used for network devices +Wants=sys-subsystem-net-devices-%i.device +After=sys-subsystem-net-devices-%i.device + +[Service] +Type=simple +RemainAfterExit=yes +ExecStart=/bin/true +TimeoutStartSec=30 + +[Install] +WantedBy=network.target From 468e33b3e22b41c1ab3a5f7ffecca78791604e24 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Mon, 15 May 2023 18:18:54 +0300 Subject: [PATCH 03/17] Add udev rule to rename switchports Signed-off-by: Taras Chornyi --- .../common/overlay/etc/udev/rules.d/10-switchdev-net.rules | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 builds/any/rootfs/buster/common/overlay/etc/udev/rules.d/10-switchdev-net.rules diff --git a/builds/any/rootfs/buster/common/overlay/etc/udev/rules.d/10-switchdev-net.rules b/builds/any/rootfs/buster/common/overlay/etc/udev/rules.d/10-switchdev-net.rules new file mode 100644 index 000000000..fde4692d0 --- /dev/null +++ b/builds/any/rootfs/buster/common/overlay/etc/udev/rules.d/10-switchdev-net.rules @@ -0,0 +1,2 @@ +SUBSYSTEM=="net", ACTION=="add", ATTR{phys_switch_id}=="[0-9][0-9]", ATTR{phys_port_name}!="", PROGRAM="/bin/sh -c 'printf %1d $attr{phys_switch_id}'", NAME="sw$attr{phys_port_name}" +SUBSYSTEM=="net", ACTION=="add", ATTR{phys_switch_id}=="[0-9][0-9]", ATTR{phys_port_name}=="p[0-9]*", PROGRAM="/bin/sh -c 'printf %1d $attr{phys_switch_id}'", NAME="sw$attr{phys_port_name}" From 7e914c0c606df8fde5e01f6aba1db19b9f8de5bb Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Mon, 15 May 2023 18:20:29 +0300 Subject: [PATCH 04/17] Update kernel 5.15 and 5.10 configs for arm64 Signed-off-by: Taras Chornyi --- .../any/kernels/5.10-lts/configs/arm64-all/arm64-all.config | 3 +++ .../any/kernels/5.15-lts/configs/arm64-all/arm64-all.config | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/packages/base/any/kernels/5.10-lts/configs/arm64-all/arm64-all.config b/packages/base/any/kernels/5.10-lts/configs/arm64-all/arm64-all.config index 68cd90c00..ce1398992 100644 --- a/packages/base/any/kernels/5.10-lts/configs/arm64-all/arm64-all.config +++ b/packages/base/any/kernels/5.10-lts/configs/arm64-all/arm64-all.config @@ -437,12 +437,14 @@ CONFIG_ARM64_CNP=y # ARMv8.3 architectural features # CONFIG_AS_HAS_PAC=y +CONFIG_ARM64_PTR_AUTH=y # end of ARMv8.3 architectural features # # ARMv8.4 architectural features # CONFIG_ARM64_AMU_EXTN=y +CONFIG_ARM64_TLB_RANGE=y # end of ARMv8.4 architectural features # @@ -7567,6 +7569,7 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_CC_HAS_KASAN_GENERIC=y +# CONFIG_KASAN is not set # end of Memory Debugging # CONFIG_DEBUG_SHIRQ is not set diff --git a/packages/base/any/kernels/5.15-lts/configs/arm64-all/arm64-all.config b/packages/base/any/kernels/5.15-lts/configs/arm64-all/arm64-all.config index e89887ae1..70b21a059 100644 --- a/packages/base/any/kernels/5.15-lts/configs/arm64-all/arm64-all.config +++ b/packages/base/any/kernels/5.15-lts/configs/arm64-all/arm64-all.config @@ -414,6 +414,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y +CONFIG_ARM64_TLB_RANGE=y CONFIG_COMPAT=y CONFIG_KUSER_HELPERS=y # CONFIG_ARMV8_DEPRECATED is not set @@ -441,6 +442,7 @@ CONFIG_ARM64_CNP=y # ARMv8.3 architectural features # CONFIG_ARM64_PTR_AUTH=y +CONFIG_ARM64_PTR_AUTH_KERNEL=y CONFIG_AS_HAS_PAC=y # end of ARMv8.3 architectural features @@ -752,6 +754,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y # GCOV-based kernel profiling # CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +# CONFIG_GCOV_KERNEL is not set # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y @@ -7812,6 +7815,7 @@ CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_HAVE_ARCH_KFENCE=y +# CONFIG_KASAN is not set # CONFIG_KFENCE is not set # end of Memory Debugging From c4af503e509f8eb9ef4f9d391ddda07834a883a0 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Mon, 15 May 2023 18:23:01 +0300 Subject: [PATCH 05/17] Switch to dentproject/builder10 This docker image is based on opennetworklinux/builder10 Signed-off-by: Taras Chornyi --- docker/tools/onlbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/tools/onlbuilder b/docker/tools/onlbuilder index eabe38f02..cb3a647ba 100755 --- a/docker/tools/onlbuilder +++ b/docker/tools/onlbuilder @@ -23,7 +23,7 @@ g_builders = { 7 : ('wheezy', 'opennetworklinux/builder7:1.2'), 8 : ('jessie', 'opennetworklinux/builder8:1.11'), 9 : ('stretch', 'dentproject/builder9:1.8' ), - 10 : ('buster', 'opennetworklinux/builder10:1.2'), + 10 : ('buster', 'dentproject/builder10:1.5'), }, } From 6a09b0644b3e03061b6bd9599df3f61a14dca147 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Mon, 15 May 2023 18:25:25 +0300 Subject: [PATCH 06/17] Add packages to arm64 debian10 build list of packages: - onl-kernel-5.15-lts-arm64-all-modules - frr - mrvl-fw-image - bridge-utils - bash-completion - man-db - dnsmasq - dnsutils - keepalived - lldpd Signed-off-by: Taras Chornyi --- .../any/rootfs/buster/common/arm64-base-packages.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/builds/any/rootfs/buster/common/arm64-base-packages.yml b/builds/any/rootfs/buster/common/arm64-base-packages.yml index 71c41a67b..8aaa1779d 100644 --- a/builds/any/rootfs/buster/common/arm64-base-packages.yml +++ b/builds/any/rootfs/buster/common/arm64-base-packages.yml @@ -1 +1,11 @@ - u-boot-tools +- onl-kernel-5.15-lts-arm64-all-modules +- frr +- mrvl-fw-image +- bridge-utils +- bash-completion +- man-db +- dnsmasq +- dnsutils +- keepalived +- lldpd From 94685a279d6aec940863fae3f4a3b759cddaea7d Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Mon, 15 May 2023 18:26:49 +0300 Subject: [PATCH 07/17] Remove unsupported devices Signed-off-by: Taras Chornyi --- setup.env | 8 -------- 1 file changed, 8 deletions(-) diff --git a/setup.env b/setup.env index d292e0dd7..eda1061ab 100755 --- a/setup.env +++ b/setup.env @@ -57,10 +57,6 @@ export ONL_SUBMODULE_UPDATED_SCRIPTS="$ONL/tools/scripts/submodule-updated.sh" # Build Whitelist export ONLPM_OPTION_PLATFORM_ALLOWLIST="\ -arm-accton-as4610-54-r0 -arm64-nxp-ls1043ardb-r0 -arm64-nxp-ls1046ardb-r0 -arm64-delta-tx4810-r0 arm64-delta-tn4810m-r0 arm64-delta-tn48m2-r0 arm64-delta-tn48m2-swdev-r0 @@ -69,14 +65,10 @@ arm64-delta-tn48m-poe-r0 arm64-delta-tn48m-dn-r0 arm64-delta-tn48m-poe-dn-r0 arm64-delta-tn4810m-dn-r0 -arm64-wnc-qsd61-aom-a-48-r0 -arm64-wnc-qsa72-aom-a-48p-r0 arm64-accton-as4224-52p-r0 arm64-accton-as4224-52t-r0 arm64-accton-as5114-48x-r0 arm64-accton-as4564-26p-r0 -x86-64-accton-as5912-54x-r0 x86-64-kvm-x86-64-r0 x86-64-mlnx-msn2410-r0 -arm64-marvell-ac5x-db-r0 " From 62fc27867b937d0743d991e19a53375d54c7ef09 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Mon, 15 May 2023 18:27:44 +0300 Subject: [PATCH 08/17] Enable debian10 build by default Signed-off-by: Taras Chornyi --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6988c259f..169ca1a22 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ $(foreach a,$(ALL_ARCHES),$(eval $(call build_arch_template,$(a)))) BUILD_ARCHES_wheezy := amd64 powerpc BUILD_ARCHES_jessie := amd64 powerpc armel BUILD_ARCHES_stretch := arm64 amd64 +BUILD_ARCHES_buster := arm64 amd64 # Build available architectures by default. .DEFAULT_GOAL := all @@ -46,7 +47,7 @@ endif .PHONY: docker ifndef VERSION -VERSION := 9 +VERSION := 10 endif docker_check: From a731b007f4329b703ddec1045fd354fe6fb7d31b Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Wed, 24 May 2023 16:37:57 +0300 Subject: [PATCH 09/17] Update debian 10 builder Add dependencies for iproute2 and ethtool Signed-off-by: Taras Chornyi --- docker/images/builder10/1.3/Dockerfile | 17 +++++++++++++++++ docker/images/builder10/1.3/Makefile | 12 ++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 docker/images/builder10/1.3/Dockerfile create mode 100644 docker/images/builder10/1.3/Makefile diff --git a/docker/images/builder10/1.3/Dockerfile b/docker/images/builder10/1.3/Dockerfile new file mode 100644 index 000000000..10d778ee9 --- /dev/null +++ b/docker/images/builder10/1.3/Dockerfile @@ -0,0 +1,17 @@ +FROM opennetworklinux/builder10:1.2 + +MAINTAINER Taras Chornyi + +RUN apt-get update --allow-releaseinfo-change && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && DEBIAN_FRONTEND=noninteractive apt-get -y install apt-cacher-ng \ + libmnl-dev libmnl-dev libelf-dev libcap-dev libxtables-dev libdb-dev + +RUN xapt -a arm64 libmnl-dev libelf-dev libcap-dev libxtables-dev libdb-dev + +RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee /etc/apt/sources.list.d/backports.list + +RUN apt-get update --allow-releaseinfo-change && DEBIAN_FRONTEND=noninteractive apt-get -y install -t buster-backports git + +RUN rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/* + +COPY docker_shell /bin/docker_shell +COPY container-id /bin/container-id diff --git a/docker/images/builder10/1.3/Makefile b/docker/images/builder10/1.3/Makefile new file mode 100644 index 000000000..2b1dcda7f --- /dev/null +++ b/docker/images/builder10/1.3/Makefile @@ -0,0 +1,12 @@ +VERSION=1.3 +USER=dentproject +REPO=builder10 + +TOOLS=../../../tools/docker_shell ../../../tools/container-id + +build: check_version + cp $(TOOLS) . + docker build -t $(USER)/$(REPO):$(VERSION) . + rm -rf $(notdir $(TOOLS)) +push: + docker push $(USER)/$(REPO):$(VERSION) From 9415f79b40cfa5ee25d9e15276ba6234b68f3d6c Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Mon, 29 May 2023 17:53:22 +0300 Subject: [PATCH 10/17] Add packages to arm64 debian10 build list of packages: - mstpd - hostapd - stress-ng - python3-pyroute2 Signed-off-by: Taras Chornyi --- builds/any/rootfs/buster/common/arm64-base-packages.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/builds/any/rootfs/buster/common/arm64-base-packages.yml b/builds/any/rootfs/buster/common/arm64-base-packages.yml index 8aaa1779d..643256bfd 100644 --- a/builds/any/rootfs/buster/common/arm64-base-packages.yml +++ b/builds/any/rootfs/buster/common/arm64-base-packages.yml @@ -9,3 +9,7 @@ - dnsutils - keepalived - lldpd +- mstpd +- hostapd +- stress-ng +- python3-pyroute2 From bacdb9599747d9a146ed46c65925fc0a9bcab987 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Tue, 30 May 2023 15:24:18 +0300 Subject: [PATCH 11/17] buster: Enable dhcp on ma1 Set default config to get IP on ma1 using dhcp Signed-off-by: Taras Chornyi --- .../any/rootfs/buster/common/overlay/etc/network/interfaces | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 builds/any/rootfs/buster/common/overlay/etc/network/interfaces diff --git a/builds/any/rootfs/buster/common/overlay/etc/network/interfaces b/builds/any/rootfs/buster/common/overlay/etc/network/interfaces new file mode 100644 index 000000000..da7901a68 --- /dev/null +++ b/builds/any/rootfs/buster/common/overlay/etc/network/interfaces @@ -0,0 +1,6 @@ +# interfaces(5) file used by ifup(8) and ifdown(8) +auto lo +iface lo inet loopback + +auto ma1 +iface ma1 inet dhcp From eb0fd92c39a15052ac26a6b186db8828e4214469 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Wed, 26 Jul 2023 14:54:12 +0300 Subject: [PATCH 12/17] debian: buster: Add FRR repo Signed-off-by: Taras Chornyi --- .../any/rootfs/buster/standard/standard.yml | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/builds/any/rootfs/buster/standard/standard.yml b/builds/any/rootfs/buster/standard/standard.yml index 35637d527..5486f7de9 100644 --- a/builds/any/rootfs/buster/standard/standard.yml +++ b/builds/any/rootfs/buster/standard/standard.yml @@ -24,21 +24,21 @@ Multistrap: noauth: true explicitsuite: false unpack: true - debootstrap: Debian-Local Local-All Local-Arch - aptsources: Debian + debootstrap: Debian-Local Local-All Local-Arch ONL-Local Security-Local FRR-Local + aptsources: Debian ONL Security Debian: packages: *Packages source: http://${DEBIAN_MIRROR} suite: ${ONL_DEBIAN_SUITE} -# keyring: debian-archive-keyring + keyring: debian-archive-keyring omitdebsrc: true Debian-Local: packages: *Packages source: http://${APT_CACHE}${DEBIAN_MIRROR} suite: ${ONL_DEBIAN_SUITE} - # keyring: debian-archive-keyring + keyring: debian-archive-keyring omitdebsrc: true ONL: @@ -55,6 +55,20 @@ Multistrap: omitdebsrc: true arches: amd64, arm64, armel + Security: + packages: *Packages + source: http://security.debian.org/debian-security + suite: buster/updates + omitdebsrc: true + arches: amd64, arm64, armel + + Security-Local: + packages: *Packages + source: http://${APT_CACHE}security.debian.org/debian-security + suite: buster/updates + omitdebsrc: true + arches: amd64, arm64, armel + Local-All: source: ${ONLPM_OPTION_REPO}/${ONL_DEBIAN_SUITE}/packages/binary-all omitdebsrc: true @@ -63,6 +77,20 @@ Multistrap: source: ${ONLPM_OPTION_REPO}/${ONL_DEBIAN_SUITE}/packages/binary-${ARCH} omitdebsrc: true + FRR: + packages: *Packages + source: http://deb.frrouting.org/frr + suite: buster frr-stable + omitdebsrc: true + arches: amd64, arm64 + + FRR-Local: + packages: *Packages + source: http://${APT_CACHE}deb.frrouting.org/frr + suite: buster frr-stable + omitdebsrc: true + arches: amd64, arm64 + Configure: overlays: - ${ONL}/builds/any/rootfs/${ONL_DEBIAN_SUITE}/common/overlay From fbb9f1cdc84024d944c493863c1178ddc9d7fb77 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Wed, 26 Jul 2023 14:54:55 +0300 Subject: [PATCH 13/17] debian: buster: Update package list replace ifupdown with ifupdown2 add lsb-release, dbus, python3-setuptools packages Signed-off-by: Taras Chornyi --- builds/any/rootfs/buster/common/all-base-packages.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builds/any/rootfs/buster/common/all-base-packages.yml b/builds/any/rootfs/buster/common/all-base-packages.yml index b8e9df5f3..567b27823 100644 --- a/builds/any/rootfs/buster/common/all-base-packages.yml +++ b/builds/any/rootfs/buster/common/all-base-packages.yml @@ -28,7 +28,7 @@ - nfs-common - netbase - bsdmainutils -- ifupdown +- ifupdown2 - psmisc - make - python-cherrypy3 @@ -85,3 +85,6 @@ - htop - tree - memtester +- lsb-release +- dbus +- python3-setuptools From 5c976640a26618f9f48f00a7d167df07dd1db7c3 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Wed, 2 Aug 2023 11:17:40 +0300 Subject: [PATCH 14/17] Adderss review comments - Add poed and petunia packages - rearrange base packages - update dent-artifacts pointer - use debian-keyring instead of debian-archive-keyring Signed-off-by: Taras Chornyi --- .../rootfs/buster/common/all-base-packages.yml | 2 ++ .../rootfs/buster/common/arm64-base-packages.yml | 8 ++++---- .../rootfs/buster/common/overlay/etc/inetd.conf | 3 --- builds/any/rootfs/buster/standard/standard.yml | 15 +++++++++++++-- sm/dent-artifacts | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/builds/any/rootfs/buster/common/all-base-packages.yml b/builds/any/rootfs/buster/common/all-base-packages.yml index 567b27823..41e6df0f1 100644 --- a/builds/any/rootfs/buster/common/all-base-packages.yml +++ b/builds/any/rootfs/buster/common/all-base-packages.yml @@ -88,3 +88,5 @@ - lsb-release - dbus - python3-setuptools +- python3-petunia +- dentos-poe-agent diff --git a/builds/any/rootfs/buster/common/arm64-base-packages.yml b/builds/any/rootfs/buster/common/arm64-base-packages.yml index 643256bfd..cdbc30613 100644 --- a/builds/any/rootfs/buster/common/arm64-base-packages.yml +++ b/builds/any/rootfs/buster/common/arm64-base-packages.yml @@ -1,15 +1,15 @@ - u-boot-tools -- onl-kernel-5.15-lts-arm64-all-modules - frr -- mrvl-fw-image - bridge-utils +- mstpd - bash-completion +- onl-kernel-5.15-lts-arm64-all-modules +- lldpd - man-db - dnsmasq - dnsutils +- mrvl-fw-image - keepalived -- lldpd -- mstpd - hostapd - stress-ng - python3-pyroute2 diff --git a/builds/any/rootfs/buster/common/overlay/etc/inetd.conf b/builds/any/rootfs/buster/common/overlay/etc/inetd.conf index 367f8d084..e69de29bb 100644 --- a/builds/any/rootfs/buster/common/overlay/etc/inetd.conf +++ b/builds/any/rootfs/buster/common/overlay/etc/inetd.conf @@ -1,3 +0,0 @@ -telnet stream tcp nowait telnetd /usr/sbin/tcpd /usr/sbin/in.telnetd -qotd stream tcp nowait telnetd /usr/sbin/tcpd /sbin/versiond - diff --git a/builds/any/rootfs/buster/standard/standard.yml b/builds/any/rootfs/buster/standard/standard.yml index 5486f7de9..622ab844c 100644 --- a/builds/any/rootfs/buster/standard/standard.yml +++ b/builds/any/rootfs/buster/standard/standard.yml @@ -31,14 +31,14 @@ Multistrap: packages: *Packages source: http://${DEBIAN_MIRROR} suite: ${ONL_DEBIAN_SUITE} - keyring: debian-archive-keyring + keyring: debian-keyring omitdebsrc: true Debian-Local: packages: *Packages source: http://${APT_CACHE}${DEBIAN_MIRROR} suite: ${ONL_DEBIAN_SUITE} - keyring: debian-archive-keyring + keyring: debian-keyring omitdebsrc: true ONL: @@ -120,6 +120,9 @@ Configure: - 'watchdog defaults' - 'wd_keepalive remove' + sytctl: + - 'disable rpcbind' + options: clean: True securetty: False @@ -127,6 +130,14 @@ Configure: console: True PermitRootLogin: 'yes' + modules: + - 'cls_basic' + - 'cls_flower' + - 'cls_u32' + - 'sch_ingress' + - 'act_police' + - 'act_gact' + users: root: password: onl diff --git a/sm/dent-artifacts b/sm/dent-artifacts index e7abfd985..48bf2949c 160000 --- a/sm/dent-artifacts +++ b/sm/dent-artifacts @@ -1 +1 @@ -Subproject commit e7abfd985bc061ee8a72aff5d4636b80ffebe3c0 +Subproject commit 48bf2949cbe0cd717ac8ee6132e78b96df9948b3 From c3e1e6f9785dd1ee579eff6550c38a7ecffea1db Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Fri, 4 Aug 2023 19:21:17 +0300 Subject: [PATCH 15/17] debian: buster: Disable hostapd by default Signed-off-by: Taras Chornyi --- builds/any/rootfs/buster/standard/standard.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builds/any/rootfs/buster/standard/standard.yml b/builds/any/rootfs/buster/standard/standard.yml index 622ab844c..61e7f69a2 100644 --- a/builds/any/rootfs/buster/standard/standard.yml +++ b/builds/any/rootfs/buster/standard/standard.yml @@ -120,8 +120,9 @@ Configure: - 'watchdog defaults' - 'wd_keepalive remove' - sytctl: + sysctl: - 'disable rpcbind' + - 'disable hostapd' options: clean: True From facf0d06c2cb1e917ab542e05fe0607d6d765ae8 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Fri, 11 Aug 2023 15:16:30 +0300 Subject: [PATCH 16/17] debian: buster: remove rc.local Signed-off-by: Taras Chornyi --- .../any/rootfs/buster/common/overlay/etc/rc.local | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 builds/any/rootfs/buster/common/overlay/etc/rc.local diff --git a/builds/any/rootfs/buster/common/overlay/etc/rc.local b/builds/any/rootfs/buster/common/overlay/etc/rc.local deleted file mode 100644 index 77ad6b751..000000000 --- a/builds/any/rootfs/buster/common/overlay/etc/rc.local +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -e -# -# rc.local -# -# This script is executed at the end of each multiuser runlevel. -# Make sure that the script will "exit 0" on success or any other -# value on error. -# -# In order to enable or disable this script just change the execution -# bits. -# -# By default this script does nothing. - -exit 0 \ No newline at end of file From c0b181664536c3fb7a6764285b9072fdc5e7e7b7 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Wed, 30 Aug 2023 14:43:23 +0300 Subject: [PATCH 17/17] builder10: bump version to 1.5 Bump version to 1.5 to sync with tag on dockehub https://hub.docker.com/r/dentproject/builder10/tags Signed-off-by: Taras Chornyi --- docker/images/builder10/{1.3 => 1.5}/Dockerfile | 0 docker/images/builder10/{1.3 => 1.5}/Makefile | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename docker/images/builder10/{1.3 => 1.5}/Dockerfile (100%) rename docker/images/builder10/{1.3 => 1.5}/Makefile (95%) diff --git a/docker/images/builder10/1.3/Dockerfile b/docker/images/builder10/1.5/Dockerfile similarity index 100% rename from docker/images/builder10/1.3/Dockerfile rename to docker/images/builder10/1.5/Dockerfile diff --git a/docker/images/builder10/1.3/Makefile b/docker/images/builder10/1.5/Makefile similarity index 95% rename from docker/images/builder10/1.3/Makefile rename to docker/images/builder10/1.5/Makefile index 2b1dcda7f..816a90a5e 100644 --- a/docker/images/builder10/1.3/Makefile +++ b/docker/images/builder10/1.5/Makefile @@ -1,4 +1,4 @@ -VERSION=1.3 +VERSION=1.5 USER=dentproject REPO=builder10