Skip to content

Commit 7b458e2

Browse files
wkzwkz
committed
defconfig: Update all architectures to use new image types
1 parent 6c57487 commit 7b458e2

File tree

7 files changed

+34
-43
lines changed

7 files changed

+34
-43
lines changed

‎configs/aarch32_defconfig‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,14 @@ BR2_PACKAGE_WATCHDOGD=y
9898
BR2_PACKAGE_LESS=y
9999
BR2_PACKAGE_MG=y
100100
BR2_PACKAGE_NANO=y
101-
BR2_TARGET_ROOTFS_SQUASHFS=y
102101
# BR2_TARGET_ROOTFS_TAR is not set
103102
BR2_PACKAGE_HOST_BMAP_TOOLS=y
104103
BR2_PACKAGE_HOST_DOSFSTOOLS=y
105104
BR2_PACKAGE_HOST_E2FSPROGS=y
106105
BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
107106
BR2_PACKAGE_HOST_GENEXT2FS=y
108-
BR2_PACKAGE_HOST_GENIMAGE=y
109107
BR2_PACKAGE_HOST_KMOD_XZ=y
110108
BR2_PACKAGE_HOST_MTOOLS=y
111-
BR2_PACKAGE_HOST_RAUC=y
112109
BR2_PACKAGE_RASPBERRYPI_RPI2=y
113110
INFIX_VENDOR_HOME="https://kernelkit.org"
114111
INFIX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers."
@@ -135,11 +132,13 @@ BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
135132
BR2_PACKAGE_LOWDOWN=y
136133
BR2_PACKAGE_MCD=y
137134
BR2_PACKAGE_MDNS_ALIAS=y
135+
BR2_PACKAGE_ONIEPROM=y
138136
BR2_PACKAGE_SHOW=y
139137
BR2_PACKAGE_ROUSETTE=y
140138
BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
139+
IMAGE_ITB_AUX=y
140+
IMAGE_ITB_QCOW=y
141+
IMAGE_ITB_RAUC=y
142+
IMAGE_README=y
141143
TRUSTED_KEYS=y
142144
TRUSTED_KEYS_DEVELOPMENT=y
143-
DISK_IMAGE_BOOT_BIN=y
144-
GNS3_APPLIANCE_RAM=512
145-
GNS3_APPLIANCE_IFNUM=10

‎configs/aarch32_minimal_defconfig‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,14 @@ BR2_PACKAGE_WATCHDOGD=y
9898
BR2_PACKAGE_LESS=y
9999
BR2_PACKAGE_MG=y
100100
BR2_PACKAGE_NANO=y
101-
BR2_TARGET_ROOTFS_SQUASHFS=y
102101
# BR2_TARGET_ROOTFS_TAR is not set
103102
BR2_PACKAGE_HOST_BMAP_TOOLS=y
104103
BR2_PACKAGE_HOST_DOSFSTOOLS=y
105104
BR2_PACKAGE_HOST_E2FSPROGS=y
106105
BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
107106
BR2_PACKAGE_HOST_GENEXT2FS=y
108-
BR2_PACKAGE_HOST_GENIMAGE=y
109107
BR2_PACKAGE_HOST_KMOD_XZ=y
110108
BR2_PACKAGE_HOST_MTOOLS=y
111-
BR2_PACKAGE_HOST_RAUC=y
112109
BR2_PACKAGE_RASPBERRYPI_RPI2=y
113110
INFIX_VENDOR_HOME="https://kernelkit.org"
114111
INFIX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers."
@@ -135,11 +132,13 @@ BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
135132
BR2_PACKAGE_LOWDOWN=y
136133
BR2_PACKAGE_MCD=y
137134
BR2_PACKAGE_MDNS_ALIAS=y
135+
BR2_PACKAGE_ONIEPROM=y
138136
BR2_PACKAGE_SHOW=y
139137
BR2_PACKAGE_ROUSETTE=y
140138
BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
139+
IMAGE_ITB_AUX=y
140+
IMAGE_ITB_QCOW=y
141+
IMAGE_ITB_RAUC=y
142+
IMAGE_README=y
141143
TRUSTED_KEYS=y
142144
TRUSTED_KEYS_DEVELOPMENT=y
143-
DISK_IMAGE_BOOT_BIN=y
144-
GNS3_APPLIANCE_RAM=512
145-
GNS3_APPLIANCE_IFNUM=10

‎configs/aarch64_defconfig‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,16 +122,12 @@ BR2_PACKAGE_WATCHDOGD=y
122122
BR2_PACKAGE_LESS=y
123123
BR2_PACKAGE_MG=y
124124
BR2_PACKAGE_NANO=y
125-
BR2_TARGET_ROOTFS_SQUASHFS=y
126125
# BR2_TARGET_ROOTFS_TAR is not set
127126
BR2_PACKAGE_HOST_BMAP_TOOLS=y
128127
BR2_PACKAGE_HOST_E2FSPROGS=y
129128
BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
130129
BR2_PACKAGE_HOST_GENEXT2FS=y
131-
BR2_PACKAGE_HOST_GENIMAGE=y
132130
BR2_PACKAGE_HOST_GO_BIN=y
133-
BR2_PACKAGE_HOST_RAUC=y
134-
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
135131
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
136132
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
137133
INFIX_VENDOR_HOME="https://kernelkit.org"
@@ -170,6 +166,7 @@ BR2_PACKAGE_LOWDOWN=y
170166
BR2_PACKAGE_MCD=y
171167
BR2_PACKAGE_MDNS_ALIAS=y
172168
BR2_PACKAGE_NETBROWSE=y
169+
BR2_PACKAGE_ONIEPROM=y
173170
BR2_PACKAGE_PODMAN=y
174171
BR2_PACKAGE_PODMAN_DRIVER_BTRFS=y
175172
BR2_PACKAGE_PODMAN_DRIVER_DEVICEMAPPER=y
@@ -179,8 +176,9 @@ BR2_PACKAGE_TETRIS=y
179176
BR2_PACKAGE_ROUSETTE=y
180177
BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
181178
BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
179+
IMAGE_ITB_AUX=y
180+
IMAGE_ITB_QCOW=y
181+
IMAGE_ITB_RAUC=y
182+
IMAGE_README=y
182183
TRUSTED_KEYS=y
183184
TRUSTED_KEYS_DEVELOPMENT=y
184-
DISK_IMAGE_BOOT_BIN=y
185-
GNS3_APPLIANCE_RAM=512
186-
GNS3_APPLIANCE_IFNUM=10

‎configs/aarch64_minimal_defconfig‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,11 @@ BR2_PACKAGE_WATCHDOGD=y
100100
BR2_PACKAGE_LESS=y
101101
BR2_PACKAGE_MG=y
102102
BR2_PACKAGE_NANO=y
103-
BR2_TARGET_ROOTFS_SQUASHFS=y
104103
# BR2_TARGET_ROOTFS_TAR is not set
105104
BR2_PACKAGE_HOST_BMAP_TOOLS=y
106105
BR2_PACKAGE_HOST_E2FSPROGS=y
107106
BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
108107
BR2_PACKAGE_HOST_GENEXT2FS=y
109-
BR2_PACKAGE_HOST_GENIMAGE=y
110-
BR2_PACKAGE_HOST_RAUC=y
111-
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
112108
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
113109
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
114110
INFIX_VENDOR_HOME="https://kernelkit.org"
@@ -143,13 +139,15 @@ BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
143139
BR2_PACKAGE_LOWDOWN=y
144140
BR2_PACKAGE_MCD=y
145141
BR2_PACKAGE_MDNS_ALIAS=y
142+
BR2_PACKAGE_ONIEPROM=y
146143
BR2_PACKAGE_LIBINPUT=y
147144
BR2_PACKAGE_ROUSETTE=y
148145
BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
149146
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
150147
BR2_PACKAGE_GETENT=y
151-
DISK_IMAGE_BOOT_BIN=y
148+
IMAGE_ITB_AUX=y
149+
IMAGE_ITB_QCOW=y
150+
IMAGE_ITB_RAUC=y
151+
IMAGE_README=y
152152
TRUSTED_KEYS=y
153153
TRUSTED_KEYS_DEVELOPMENT=y
154-
GNS3_APPLIANCE_RAM=512
155-
GNS3_APPLIANCE_IFNUM=10

‎configs/riscv64_defconfig‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ BR2_TARGET_ROOTFS_EXT2_4=y
139139
BR2_TARGET_ROOTFS_EXT2_SIZE="512M"
140140
BR2_TARGET_ROOTFS_EXT2_INODE_SIZE=0
141141
BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,large_file,ext_attr"
142-
BR2_TARGET_ROOTFS_SQUASHFS=y
143142
# BR2_TARGET_ROOTFS_TAR is not set
144143
BR2_TARGET_OPENSBI=y
145144
BR2_TARGET_OPENSBI_CUSTOM_VERSION=y
@@ -165,9 +164,6 @@ BR2_TARGET_UBOOT_SPL=y
165164
BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin.normal.out"
166165
BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_INFIX_PATH)/board/riscv64/visionfive2/uboot/visionfive2-env.dtsi"
167166
BR2_PACKAGE_HOST_BMAP_TOOLS=y
168-
BR2_PACKAGE_HOST_GENIMAGE=y
169-
BR2_PACKAGE_HOST_RAUC=y
170-
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
171167
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
172168
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
173169
INFIX_VENDOR_HOME="https://kernelkit.org"
@@ -195,6 +191,7 @@ BR2_PACKAGE_LOWDOWN=y
195191
BR2_PACKAGE_MCD=y
196192
BR2_PACKAGE_MDNS_ALIAS=y
197193
BR2_PACKAGE_NETBROWSE=y
194+
BR2_PACKAGE_ONIEPROM=y
198195
BR2_PACKAGE_PODMAN=y
199196
BR2_PACKAGE_PODMAN_DRIVER_BTRFS=y
200197
BR2_PACKAGE_PODMAN_DRIVER_DEVICEMAPPER=y
@@ -205,6 +202,8 @@ BR2_PACKAGE_ROUSETTE=y
205202
BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
206203
BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
207204
IMAGE_ITB_AUX=y
205+
IMAGE_ITB_QCOW=y
206+
IMAGE_ITB_RAUC=y
207+
IMAGE_README=y
208208
TRUSTED_KEYS=y
209209
TRUSTED_KEYS_DEVELOPMENT=y
210-
# GNS3_APPLIANCE is not set

‎configs/x86_64_defconfig‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ BR2_PACKAGE_WATCHDOGD=y
118118
BR2_PACKAGE_LESS=y
119119
BR2_PACKAGE_MG=y
120120
BR2_PACKAGE_NANO=y
121-
BR2_TARGET_ROOTFS_SQUASHFS=y
122121
# BR2_TARGET_ROOTFS_TAR is not set
123122
BR2_TARGET_EDK2=y
124123
BR2_TARGET_GRUB2=y
@@ -130,11 +129,8 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
130129
BR2_PACKAGE_HOST_E2FSPROGS=y
131130
BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
132131
BR2_PACKAGE_HOST_GENEXT2FS=y
133-
BR2_PACKAGE_HOST_GENIMAGE=y
134132
BR2_PACKAGE_HOST_GO_BIN=y
135133
BR2_PACKAGE_HOST_MTOOLS=y
136-
BR2_PACKAGE_HOST_RAUC=y
137-
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
138134
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
139135
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
140136
INFIX_VENDOR_HOME="https://kernelkit.org"
@@ -167,6 +163,7 @@ BR2_PACKAGE_LOWDOWN=y
167163
BR2_PACKAGE_MCD=y
168164
BR2_PACKAGE_MDNS_ALIAS=y
169165
BR2_PACKAGE_NETBROWSE=y
166+
BR2_PACKAGE_ONIEPROM=y
170167
BR2_PACKAGE_PODMAN=y
171168
BR2_PACKAGE_PODMAN_DRIVER_BTRFS=y
172169
BR2_PACKAGE_PODMAN_DRIVER_DEVICEMAPPER=y
@@ -176,7 +173,9 @@ BR2_PACKAGE_TETRIS=y
176173
BR2_PACKAGE_ROUSETTE=y
177174
BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
178175
BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
176+
IMAGE_ITB_AUX=y
177+
IMAGE_ITB_QCOW=y
178+
IMAGE_ITB_RAUC=y
179+
IMAGE_README=y
179180
TRUSTED_KEYS=y
180181
TRUSTED_KEYS_DEVELOPMENT=y
181-
GNS3_APPLIANCE_RAM=512
182-
GNS3_APPLIANCE_IFNUM=10

‎configs/x86_64_minimal_defconfig‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ BR2_PACKAGE_WATCHDOGD=y
9696
BR2_PACKAGE_LESS=y
9797
BR2_PACKAGE_MG=y
9898
BR2_PACKAGE_NANO=y
99-
BR2_TARGET_ROOTFS_SQUASHFS=y
10099
# BR2_TARGET_ROOTFS_TAR is not set
101100
BR2_TARGET_EDK2=y
102101
BR2_TARGET_GRUB2=y
@@ -108,10 +107,7 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
108107
BR2_PACKAGE_HOST_E2FSPROGS=y
109108
BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
110109
BR2_PACKAGE_HOST_GENEXT2FS=y
111-
BR2_PACKAGE_HOST_GENIMAGE=y
112110
BR2_PACKAGE_HOST_MTOOLS=y
113-
BR2_PACKAGE_HOST_RAUC=y
114-
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
115111
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
116112
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
117113
INFIX_VENDOR_HOME="https://kernelkit.org"
@@ -138,10 +134,13 @@ BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
138134
BR2_PACKAGE_LOWDOWN=y
139135
BR2_PACKAGE_MCD=y
140136
BR2_PACKAGE_MDNS_ALIAS=y
137+
BR2_PACKAGE_ONIEPROM=y
141138
BR2_PACKAGE_SHOW=y
142139
BR2_PACKAGE_ROUSETTE=y
143140
BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
141+
IMAGE_ITB_AUX=y
142+
IMAGE_ITB_QCOW=y
143+
IMAGE_ITB_RAUC=y
144+
IMAGE_README=y
144145
TRUSTED_KEYS=y
145146
TRUSTED_KEYS_DEVELOPMENT=y
146-
GNS3_APPLIANCE_RAM=512
147-
GNS3_APPLIANCE_IFNUM=10

0 commit comments

Comments
 (0)