From d6c100d0604bf70d5b28a666f80ff026d5727418 Mon Sep 17 00:00:00 2001 From: Cary Chen Date: Mon, 8 May 2023 16:42:41 +0800 Subject: [PATCH 01/24] [tn48m] Add new platform TN48M2-SWDEV - Add new platform support for TN48M2-SWDEV to Dent-3.0. This Platform is modified from TN48M2 with the SPI flash changed to 64MB to accommodate switchdev supported ONIE. Signed-off-by: Cary Chen --- .../5.15-lts/configs/arm64-all/Makefile | 2 +- .../module/src/platform_lib.c | 26 +++++++++ .../module/src/platform_lib.h | 2 + .../src/arm64_delta_tn48m/module/src/psui.c | 7 +++ .../src/arm64_delta_tn48m/module/src/sysi.c | 5 ++ .../src/modules/arm64-delta-tn48m-cpld.c | 7 +++ .../delta/arm64/tn48m/tn48m2-swdev/.gitignore | 2 + .../delta/arm64/tn48m/tn48m2-swdev/Makefile | 1 + .../arm64/tn48m/tn48m2-swdev/modules/Makefile | 1 + .../arm64/tn48m/tn48m2-swdev/modules/PKG.yml | 1 + .../tn48m2-swdev/modules/builds/.gitignore | 1 + .../tn48m2-swdev/modules/builds/Makefile | 7 +++ .../arm64/tn48m/tn48m2-swdev/onlp/Makefile | 1 + .../arm64/tn48m/tn48m2-swdev/onlp/PKG.yml | 1 + .../tn48m/tn48m2-swdev/onlp/builds/Makefile | 2 + .../tn48m2-swdev/onlp/builds/lib/Makefile | 3 ++ .../onlp/builds/onlpdump/Makefile | 3 ++ .../tn48m2-swdev/platform-config/Makefile | 1 + .../tn48m2-swdev/platform-config/r0/Makefile | 1 + .../tn48m2-swdev/platform-config/r0/PKG.yml | 1 + .../src/lib/arm64-delta-tn48m2-swdev-r0.yml | 54 +++++++++++++++++++ .../arm64_delta_tn48m2_swdev_r0/__init__.py | 38 +++++++++++++ setup.env | 1 + 23 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/.gitignore create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/Makefile create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/Makefile create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/PKG.yml create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/builds/.gitignore create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/builds/Makefile create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/Makefile create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/PKG.yml create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/Makefile create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/lib/Makefile create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/onlpdump/Makefile create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/Makefile create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/Makefile create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/PKG.yml create mode 100644 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/src/lib/arm64-delta-tn48m2-swdev-r0.yml create mode 100755 packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/src/python/arm64_delta_tn48m2_swdev_r0/__init__.py diff --git a/packages/base/any/kernels/5.15-lts/configs/arm64-all/Makefile b/packages/base/any/kernels/5.15-lts/configs/arm64-all/Makefile index 6ed5bf116..5b2e1d3ef 100644 --- a/packages/base/any/kernels/5.15-lts/configs/arm64-all/Makefile +++ b/packages/base/any/kernels/5.15-lts/configs/arm64-all/Makefile @@ -15,7 +15,7 @@ K_PATCH_SERIES=series.arm64 include ../../kconfig.mk K_CONFIG := arm64-all.config -K_BUILD_TARGET := Image Image.gz freescale/fsl-ls1043a-rdb.dtb freescale/fsl-ls1046a-rdb-sdk.dtb freescale/fsl-ls2080a-rdb.dtb freescale/fsl-ls2088a-rdb.dtb freescale/fsl-ls1088a-rdb.dtb marvell/accton-as4224.dtb marvell/accton-as5114.dtb marvell/accton-as4564-26p.dtb marvell/delta-tn48m.dtb marvell/delta-tn4810m.dtb marvell/delta-tn48m-dn.dtb marvell/delta-tn4810m-dn.dtb +K_BUILD_TARGET := Image Image.gz freescale/fsl-ls1043a-rdb.dtb freescale/fsl-ls1046a-rdb-sdk.dtb freescale/fsl-ls2080a-rdb.dtb freescale/fsl-ls2088a-rdb.dtb freescale/fsl-ls1088a-rdb.dtb marvell/accton-as4224.dtb marvell/accton-as5114.dtb marvell/accton-as4564-26p.dtb marvell/delta-tn48m.dtb marvell/delta-tn4810m.dtb marvell/delta-tn48m-dn.dtb marvell/delta-tn4810m-dn.dtb marvell/delta-tn48m2-swdev.dtb K_COPY_SRC := arch/arm64/boot/Image K_COPY_GZIP := 1 ifndef K_COPY_DST diff --git a/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.c b/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.c index 96bbcf7b2..e757ccf49 100644 --- a/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.c +++ b/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "platform_lib.h" plat_id_t gPlat_id = PID_UNKNOWN; @@ -111,6 +112,22 @@ plat_info_t gPlat_info[] = { .psu_count = 2, .led_count = 3, + .sfp_start_idx = 49, + .sfp_end_idx = 52, + }, + [PID_TN48M2_SWDEV] = { + .name = "arm64-delta-tn48m2-swdev", + + .onie_eeprom_path = "/sys/bus/i2c/devices/1-0056/eeprom", + + .cpld_bus = 0, + .cpld_path = "/sys/bus/i2c/devices/0-0041", + + .thermal_count = 11, + .fan_count = 3, + .psu_count = 3, + .led_count = 3, + .sfp_start_idx = 49, .sfp_end_idx = 52, }, @@ -119,12 +136,14 @@ plat_info_t gPlat_info[] = { plat_id_t get_platform_id(void) { int len; + int rc; int pid = PID_UNKNOWN; int cpld_bus = 0; char buf[4] = {0}; char pid_fullpath[PATH_MAX] = {0}; plat_info_t *tn48m_info = &gPlat_info[PID_TN48M]; plat_info_t *tn4810m_pvt_info = &gPlat_info[PID_TN4810M_PVT]; + onlp_onie_info_t onie_syseeprom; if (plat_os_file_is_existed(tn48m_info->cpld_path)) { sprintf(pid_fullpath, "%s/platform_id", tn48m_info->cpld_path); @@ -148,6 +167,13 @@ plat_id_t get_platform_id(void) if (pid == PID_TN4810M_PVT && cpld_bus == 0) pid = PID_TN4810M_NONPVT; + /* Special case to check TN48M2-SWDEV platform */ + if (pid == PID_TN48M2) { + rc = onlp_onie_decode_file(&onie_syseeprom, tn48m_info->onie_eeprom_path); + if (rc >= 0 && onie_syseeprom.device_version >= 4) + pid = PID_TN48M2_SWDEV; + } + return pid; } diff --git a/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.h b/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.h index c55beaccc..5d71a8b24 100644 --- a/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.h +++ b/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.h @@ -40,6 +40,7 @@ typedef enum plat_id { PID_TN4810M_PVT, PID_TN48M2, PID_TN4810M_NONPVT, + PID_TN48M2_SWDEV, PID_UNKNOWN, } plat_id_t; @@ -156,6 +157,7 @@ typedef enum plat_psu_id { PLAT_PSU_ID_INVALID = 0, PLAT_PSU_ID_1, PLAT_PSU_ID_2, + PLAT_PSU_ID_3, PLAT_PSU_ID_MAX } plat_psu_id_t; diff --git a/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/psui.c b/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/psui.c index 0f26d3aa3..8342aa954 100644 --- a/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/psui.c +++ b/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/psui.c @@ -173,6 +173,12 @@ static plat_psu_t plat_tn48m2_psus[] = { .power_status_path = "/sys/bus/i2c/devices/0-0041/psu2_powergood", .state = PLAT_PSU_STATE_PRESENT, }, + [PLAT_PSU_ID_3] = { + .name = "DCIN", + .type = PLAT_PSU_TYPE_DC12, + .power_status_path = "/sys/bus/i2c/devices/0-0041/dcin_powergood", + .state = PLAT_PSU_STATE_PRESENT, + }, }; static plat_psu_t* get_plat_psu() @@ -186,6 +192,7 @@ static plat_psu_t* get_plat_psu() else if (gPlat_id == PID_TN4810M_NONPVT) return plat_tn4810m_nonpvt_psus; else + /* tn48m2 and tn48m2-swdev shares the same psu configuration */ return plat_tn48m2_psus; } diff --git a/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/sysi.c b/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/sysi.c index 4c9bf3884..041f3d2ba 100644 --- a/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/sysi.c +++ b/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/sysi.c @@ -53,6 +53,8 @@ onlp_sysi_platform_get(void) return "arm64-delta-tn48m-poe"; else if (gPlat_id == PID_TN48M2) return "arm64-delta-tn48m2"; + else if (gPlat_id == PID_TN48M2_SWDEV) + return "arm64-delta-tn48m2-swdev"; else if (gPlat_id == PID_TN4810M_PVT || gPlat_id == PID_TN4810M_NONPVT) return "arm64-delta-tn4810m"; else @@ -73,6 +75,9 @@ onlp_sysi_platform_set(const char* platform) if (strstr(platform, "arm64-delta-tn48m-poe-r0")) { return ONLP_STATUS_OK; } + if (strstr(platform, "arm64-delta-tn48m2-swdev-r0")) { + return ONLP_STATUS_OK; + } if (strstr(platform, "arm64-delta-tn4810m-r0")) { return ONLP_STATUS_OK; } diff --git a/packages/platforms/delta/arm64/tn48m/src/modules/arm64-delta-tn48m-cpld.c b/packages/platforms/delta/arm64/tn48m/src/modules/arm64-delta-tn48m-cpld.c index 73dfd87b5..b58c8e0c2 100644 --- a/packages/platforms/delta/arm64/tn48m/src/modules/arm64-delta-tn48m-cpld.c +++ b/packages/platforms/delta/arm64/tn48m/src/modules/arm64-delta-tn48m-cpld.c @@ -53,6 +53,7 @@ #define TN48M_CPLD_BIT_PSU2_PRESENT 1 #define TN48M_CPLD_BIT_PSU1_PG 2 #define TN48M_CPLD_BIT_PSU2_PG 3 +#define TN48M_CPLD_BIT_DCIN_PG 6 #define I2C_RW_RETRY_COUNT 10 #define I2C_RW_RETRY_INTERVAL 60 /* ms */ @@ -124,6 +125,7 @@ enum tn48m_cpld_sysfs_attributes { PSU2_PRESENT, PSU1_PG, PSU2_PG, + DCIN_PG, MODULE_PRESENT_ALL, MODULE_RX_LOS_ALL, MODULE_TX_DIS_ALL, @@ -410,6 +412,9 @@ static ssize_t show_psu_status_bit(struct device *dev, case PSU2_PG: bit = !!(data->psu_status & BIT(TN48M_CPLD_BIT_PSU2_PG)); break; + case DCIN_PG: + bit = !!(data->psu_status & BIT(TN48M_CPLD_BIT_DCIN_PG)); + break; default: bit = 0; dev_err(dev, "Unknown case %d in show_psu_status_bit.\n", attr->index); @@ -423,6 +428,7 @@ static SENSOR_DEVICE_ATTR(psu1_present, S_IRUGO, show_psu_status_bit, NULL, PSU1 static SENSOR_DEVICE_ATTR(psu2_present, S_IRUGO, show_psu_status_bit, NULL, PSU2_PRESENT); static SENSOR_DEVICE_ATTR(psu1_powergood, S_IRUGO, show_psu_status_bit, NULL, PSU1_PG); static SENSOR_DEVICE_ATTR(psu2_powergood, S_IRUGO, show_psu_status_bit, NULL, PSU2_PG); +static SENSOR_DEVICE_ATTR(dcin_powergood, S_IRUGO, show_psu_status_bit, NULL, DCIN_PG); static ssize_t show_module_status_all(struct device *dev, struct device_attribute *devattr, @@ -646,6 +652,7 @@ static struct attribute *tn48m_cpld_attributes[] = { &sensor_dev_attr_psu2_present.dev_attr.attr, &sensor_dev_attr_psu1_powergood.dev_attr.attr, &sensor_dev_attr_psu2_powergood.dev_attr.attr, + &sensor_dev_attr_dcin_powergood.dev_attr.attr, /* tn48m transceiver attributes */ &sensor_dev_attr_module_tx_dis_all.dev_attr.attr, &sensor_dev_attr_module_present_all.dev_attr.attr, diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/.gitignore b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/.gitignore new file mode 100644 index 000000000..da339e467 --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/.gitignore @@ -0,0 +1,2 @@ +*arm64*delta*tn48m2*swdev*.mk +onlpdump.mk diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/Makefile b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/Makefile new file mode 100644 index 000000000..dc1e7b86f --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/Makefile @@ -0,0 +1 @@ +include $(ONL)/make/pkg.mk diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/Makefile b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/Makefile new file mode 100644 index 000000000..dc1e7b86f --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/Makefile @@ -0,0 +1 @@ +include $(ONL)/make/pkg.mk diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/PKG.yml b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/PKG.yml new file mode 100644 index 000000000..20c97e80f --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/PKG.yml @@ -0,0 +1 @@ +!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=delta BASENAME=arm64-delta-tn48m2-swdev KERNELS="onl-kernel-5.15-lts-arm64-all:arm64" diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/builds/.gitignore b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/builds/.gitignore new file mode 100644 index 000000000..a65b41774 --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/builds/.gitignore @@ -0,0 +1 @@ +lib diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/builds/Makefile b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/builds/Makefile new file mode 100644 index 000000000..6732f07f0 --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/modules/builds/Makefile @@ -0,0 +1,7 @@ +KERNELS := onl-kernel-5.15-lts-arm64-all:arm64 +KMODULES := $(ONL)/packages/platforms/delta/arm64/tn48m/src/modules/ +VENDOR := delta +BASENAME := arm64-delta-tn48m2-swdev +ARCH := arm64 +include $(ONL)/make/kmodule.mk +export CROSS_COMPILE=aarch64-linux-gnu- diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/Makefile b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/Makefile new file mode 100644 index 000000000..dc1e7b86f --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/Makefile @@ -0,0 +1 @@ +include $(ONL)/make/pkg.mk diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/PKG.yml b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/PKG.yml new file mode 100644 index 000000000..eedcb9054 --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/PKG.yml @@ -0,0 +1 @@ +!include $ONL_TEMPLATES/onlp-platform-any.yml PLATFORM=arm64-delta-tn48m2-swdev ARCH=arm64 TOOLCHAIN=aarch64-linux-gnu diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/Makefile b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/Makefile new file mode 100644 index 000000000..e7437cb23 --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/Makefile @@ -0,0 +1,2 @@ +FILTER=src +include $(ONL)/make/subdirs.mk diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/lib/Makefile b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/lib/Makefile new file mode 100644 index 000000000..3e398d9e2 --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/lib/Makefile @@ -0,0 +1,3 @@ +PLATFORM := arm64-delta-tn48m2-swdev +PLATFORM_MODULE := arm64_delta_tn48m +include $(ONL)/packages/base/any/onlp/builds/platform/libonlp-platform.mk diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/onlpdump/Makefile b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/onlpdump/Makefile new file mode 100644 index 000000000..7fe1822fe --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/onlp/builds/onlpdump/Makefile @@ -0,0 +1,3 @@ +PLATFORM := arm64-delta-tn48m2-swdev +PLATFORM_MODULE := arm64_delta_tn48m +include $(ONL)/packages/base/any/onlp/builds/platform/onlps.mk diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/Makefile b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/Makefile new file mode 100644 index 000000000..dc1e7b86f --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/Makefile @@ -0,0 +1 @@ +include $(ONL)/make/pkg.mk diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/Makefile b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/Makefile new file mode 100644 index 000000000..dc1e7b86f --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/Makefile @@ -0,0 +1 @@ +include $(ONL)/make/pkg.mk diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/PKG.yml b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/PKG.yml new file mode 100644 index 000000000..436866238 --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/PKG.yml @@ -0,0 +1 @@ +!include $ONL_TEMPLATES/platform-config-platform.yml ARCH=arm64 VENDOR=delta BASENAME=arm64-delta-tn48m2-swdev REVISION=r0 diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/src/lib/arm64-delta-tn48m2-swdev-r0.yml b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/src/lib/arm64-delta-tn48m2-swdev-r0.yml new file mode 100644 index 000000000..dd064558a --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/src/lib/arm64-delta-tn48m2-swdev-r0.yml @@ -0,0 +1,54 @@ +--- + +###################################################################### +# +# platform-config for TN48M2-SWDEV +# +###################################################################### + +arm64-delta-tn48m2-swdev-r0: + flat_image_tree: + kernel: + <<: *arm64-kernel-5-15 + dtb: + =: delta-tn48m2-swdev.dtb + <<: *arm64-kernel-5-15-package + itb: + <<: *arm64-itb + + loader: + device: /dev/sda + ##partition: /dev/sda1 + loadaddr: 0x10000000 + nos_bootcmds: *ssd_bootcmds + + setenv: + - bootargs: >- + $console + onl_platform=$onl_platform + + environment: + - device: /dev/mtd1 + env_offset: 0x00000000 + env_size: 0x00010000 + sector_size: 0x00010000 + + installer: + - ONL-BOOT: + =: 128MiB + format: ext2 + ##format: raw + - ONL-CONFIG: + =: 128MiB + format: ext4 + - ONL-IMAGES: + =: 1GiB + format: ext4 + - ONL-DATA: + =: 100% + format: ext4 + + network: + interfaces: + ma1: + name: eth0 diff --git a/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/src/python/arm64_delta_tn48m2_swdev_r0/__init__.py b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/src/python/arm64_delta_tn48m2_swdev_r0/__init__.py new file mode 100755 index 000000000..07a402020 --- /dev/null +++ b/packages/platforms/delta/arm64/tn48m/tn48m2-swdev/platform-config/r0/src/python/arm64_delta_tn48m2_swdev_r0/__init__.py @@ -0,0 +1,38 @@ +#!/usr/bin/python + +from onl.platform.base import * +from onl.platform.delta import * + +class OnlPlatform_arm64_delta_tn48m2_swdev_r0(OnlPlatformDelta, + OnlPlatformPortConfig_48x1_4x10): + PLATFORM='arm64-delta-tn48m2-swdev-r0' + MODEL="TN48M2-SWDEV" + SYS_OBJECT_ID=".48.14" + + def baseconfig(self): + # Insert platform drivers + self.insmod("arm64-delta-tn48m-cpld.ko") + self.insmod("arm64-delta-tn48m-led.ko") + + ########### initialize I2C bus 1 ########### + self.new_i2c_devices ( + [ + # FAN Controller + ('adt7473', 0x2e, 1), + + # Temperature devices + ('tmp1075', 0x4a, 1), + ('tmp1075', 0x4b, 1), + ] + ) + + # Insert Marvell prestera modules by only probing prestera_pci module + # Suggested by Taras Chornyi + self.modprobe('prestera_pci') + + # set up systemctl rules + for swp in range(1, 53): + cmd = "systemctl enable switchdev-online@swp%d" % swp + subprocess.check_call(cmd, shell=True) + + return True diff --git a/setup.env b/setup.env index e312887d6..d292e0dd7 100755 --- a/setup.env +++ b/setup.env @@ -63,6 +63,7 @@ arm64-nxp-ls1046ardb-r0 arm64-delta-tx4810-r0 arm64-delta-tn4810m-r0 arm64-delta-tn48m2-r0 +arm64-delta-tn48m2-swdev-r0 arm64-delta-tn48m-r0 arm64-delta-tn48m-poe-r0 arm64-delta-tn48m-dn-r0 From c846a24b6e7a13ba739c055ace38cf44d0cc1a36 Mon Sep 17 00:00:00 2001 From: Cary Chen Date: Wed, 17 May 2023 10:16:36 +0800 Subject: [PATCH 02/24] [tn48m] Add DC power status support for TN48M2 ONLP - Added support to show DC power input status in ONLP for TN48M2 platform Signed-off-by: Cary Chen --- .../arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.c b/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.c index e757ccf49..1d9426d48 100644 --- a/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.c +++ b/packages/platforms/delta/arm64/tn48m/src/arm64_delta_tn48m/module/src/platform_lib.c @@ -109,7 +109,7 @@ plat_info_t gPlat_info[] = { .thermal_count = 11, .fan_count = 3, - .psu_count = 2, + .psu_count = 3, .led_count = 3, .sfp_start_idx = 49, From 0cd05ba0a3ebb46dcca6cf8a8ff23dab577efa5d Mon Sep 17 00:00:00 2001 From: Taras Chornyi <73535074+taraschornyiplv@users.noreply.github.com> Date: Thu, 6 Jul 2023 18:14:59 +0300 Subject: [PATCH 03/24] Update README.md Replace the link to build instructions from ONL to DentOS Signed-off-by: Taras Chornyi --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7e7ac57a2..cdf6a6852 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,8 @@ Licenses for the software are described under the [LICENSE](LICENSE) file. Down Documentation ------------- -* [docs/Building.md](docs/Building.md) - Instructions for building ONL from scratch. - -Please see the docs directory for additional information. +* [Build procedure](https://github.com/dentproject/dentOS/wiki/Building) + Instructions for building DentOS Release Artifacts: ----------------- From 5d2c1e28d7ce81b1b18da9401ad70e248f511a33 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Fri, 9 Jun 2023 13:20:44 +0300 Subject: [PATCH 04/24] arm64: kernel 5.15: Enable VRF Enable VRF in kernel config Signed-off-by: Taras Chornyi --- .../any/kernels/5.15-lts/configs/arm64-all/arm64-all.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2aba10dca..e89887ae1 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 @@ -2225,7 +2225,7 @@ CONFIG_TAP=y CONFIG_VETH=y CONFIG_VIRTIO_NET=y # CONFIG_NLMON is not set -# CONFIG_NET_VRF is not set +CONFIG_NET_VRF=y # CONFIG_ARCNET is not set CONFIG_ETHERNET=y CONFIG_NET_VENDOR_3COM=y From 1509af777eff809daae989bac677c6d2cc0ab309 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Wed, 18 Jan 2023 13:04:51 +0200 Subject: [PATCH 05/24] Convert onlbuilder to python3 Signed-off-by: Taras Chornyi --- docker/tools/onlbuilder | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/tools/onlbuilder b/docker/tools/onlbuilder index be1bc15b1..8e85cfca0 100755 --- a/docker/tools/onlbuilder +++ b/docker/tools/onlbuilder @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python import os import sys @@ -126,10 +126,10 @@ logger.debug('arguments: %s\n' % vars(ops)) if ops.pull: try: - print "Pulling %s..." % ops.image + print("Pulling %s..." % ops.image) x = subprocess.check_output(('docker', 'pull', ops.image), stderr=subprocess.STDOUT) - print "done." - except subprocess.CalledProcessError, e: + print("done.") + except subprocess.CalledProcessError as e: sys.stderr.write("** Failed to pull the docker image %s (%d):\n\n%s\n" % (ops.image, e.returncode, e.output)) sys.exit(1) From ebf0f1f10f3988a67ec19ef09176196980f42478 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Fri, 9 Jun 2023 13:05:54 +0300 Subject: [PATCH 06/24] onlbuilder: fix warning SyntaxWarning: "is" with a literal. Did you mean "=="? if len(ops.isolate) is 0: 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 8e85cfca0..705ee248f 100755 --- a/docker/tools/onlbuilder +++ b/docker/tools/onlbuilder @@ -174,7 +174,7 @@ else: g_docker_arguments = "docker run --privileged %(interactive)s -t -e DOCKER_IMAGE=%(image)s --name %(name)s %(ssh_options)s %(volume_options)s " % g_arg_d if ops.isolate is not None: - if len(ops.isolate) is 0: + if len(ops.isolate) == 0: ops.isolate.append(os.getcwd()) isolates = [ os.path.abspath(i) for i in ops.isolate ] From 7690e7c47b6da97fc15d8660d010e34f125368c1 Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Mon, 19 Jun 2023 11:53:35 +0300 Subject: [PATCH 07/24] onlbuilder: find python3 path dynamically use env to locate python3 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 705ee248f..eabe38f02 100755 --- a/docker/tools/onlbuilder +++ b/docker/tools/onlbuilder @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 import os import sys From 54546f873e8cf476685fdd3394871450903cb32f Mon Sep 17 00:00:00 2001 From: Taras Chornyi Date: Mon, 15 May 2023 12:41:14 +0300 Subject: [PATCH 08/24] 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 09/24] 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 10/24] 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 11/24] 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 12/24] 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 13/24] 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 14/24] 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 15/24] 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 16/24] 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 17/24] 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 18/24] 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 19/24] 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 20/24] 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 21/24] 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 22/24] 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 23/24] 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 24/24] 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