Merge pull request #216 from taraschornyiplv/debian10

Update DentOS to debian10

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:

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,8 @@
 - htop
 - tree
 - memtester
+- lsb-release
+- dbus
+- python3-setuptools
+- python3-petunia
+- dentos-poe-agent

builds/any/rootfs/buster/common/arm64-base-packages.yml

@@ -1 +1,15 @@
 - u-boot-tools
+- frr
+- bridge-utils
+- mstpd
+- bash-completion
+- onl-kernel-5.15-lts-arm64-all-modules
+- lldpd
+- man-db
+- dnsmasq
+- dnsutils
+- mrvl-fw-image
+- keepalived
+- hostapd
+- stress-ng
+- python3-pyroute2

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
-

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

builds/any/rootfs/buster/common/overlay/etc/systemd/system/networking.service.d/switchdev-online.conf

@@ -0,0 +1,2 @@
+[Unit]
+After=network-pre.target

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

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}"

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-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:
@@ -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
@@ -92,13 +120,25 @@ Configure:
     - 'watchdog defaults'
     - 'wd_keepalive remove'
 
+  sysctl:
+    - 'disable rpcbind'
+    - 'disable hostapd'
+
   options:
     clean: True
     securetty: False
     ttys: False
     console: True
     PermitRootLogin: 'yes'
 
+  modules:
+    - 'cls_basic'
+    - 'cls_flower'
+    - 'cls_u32'
+    - 'sch_ingress'
+    - 'act_police'
+    - 'act_gact'
+
   users:
     root:
       password: onl

docker/images/builder10/1.5/Dockerfile

@@ -0,0 +1,17 @@
+FROM opennetworklinux/builder10:1.2
+
+MAINTAINER Taras Chornyi <[email protected]>
+
+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

docker/images/builder10/1.5/Makefile

@@ -0,0 +1,12 @@
+VERSION=1.5
+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)

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'),
       },
 }
 

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

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
 

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
 "