Skip to content

Commit 80ee641

Browse files
committed
configs: add image description to each defconfig
This was a tricky one, beacuse there's a bug in /buildroot/fs/oci/oci.mk that cause any value with spaces to be split regardless of quoting or escaping. As a workaround I've used U+2800 (Braille Pattern Blank) which survives this, but it is not possible to edit with menuconfig. The problem is $(foreach label,$(OCI_LABELS),...), which splits on all and any whitespace, regardless of quoting. It doesn't understand shell quotes or escaping. So the following: .url=... .title=... .description='text with spaces' Gets split into multiple items at every space, not just at the dots between labels. Compared to how ENTRYPOINT/CMD are handled: $(shell eval printf -- "--entrypoint\ \'%s\'\ " $(BR2_TARGET_ROOTFS_OCI_ENTRYPOINT)) This properly handles spaces with shell quoting. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
1 parent 1212fcb commit 80ee641

10 files changed

+10
-10
lines changed

configs/httpd_amd64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ BR2_TARGET_ROOTFS_OCI_ENTRYPOINT="/usr/bin/tini --"
2323
BR2_TARGET_ROOTFS_OCI_CMD="/usr/sbin/httpd -f -v"
2424
BR2_TARGET_ROOTFS_OCI_WORKDIR="/var/www"
2525
BR2_TARGET_ROOTFS_OCI_PORTS="80/tcp"
26-
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-httpd"
26+
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-httpd .description=Ultra-lightweight⠀BusyBox⠀web⠀server⠀for⠀embedded⠀applications⠀and⠀IoT⠀devices."
2727
# BR2_TARGET_ROOTFS_TAR is not set

configs/httpd_arm64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ BR2_TARGET_ROOTFS_OCI_ENTRYPOINT="/usr/bin/tini --"
2424
BR2_TARGET_ROOTFS_OCI_CMD="/usr/sbin/httpd -f -v"
2525
BR2_TARGET_ROOTFS_OCI_WORKDIR="/var/www"
2626
BR2_TARGET_ROOTFS_OCI_PORTS="80/tcp"
27-
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-httpd"
27+
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-httpd .description=Ultra-lightweight⠀BusyBox⠀web⠀server⠀for⠀embedded⠀applications⠀and⠀IoT⠀devices."
2828
# BR2_TARGET_ROOTFS_TAR is not set

configs/neofetch_amd64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ BR2_TARGET_ROOTFS_OCI=y
2121
BR2_TARGET_ROOTFS_OCI_AUTHOR="curiOS"
2222
BR2_TARGET_ROOTFS_OCI_TAG="curios-neofetch"
2323
BR2_TARGET_ROOTFS_OCI_ENTRYPOINT="/usr/bin/neofetch"
24-
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-neofetch"
24+
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-neofetch .description=System⠀information⠀display⠀tool⠀with⠀ASCII⠀art."
2525
# BR2_TARGET_ROOTFS_TAR is not set

configs/neofetch_arm64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ BR2_TARGET_ROOTFS_OCI=y
2222
BR2_TARGET_ROOTFS_OCI_AUTHOR="curiOS"
2323
BR2_TARGET_ROOTFS_OCI_TAG="curios-neofetch"
2424
BR2_TARGET_ROOTFS_OCI_ENTRYPOINT="/usr/bin/neofetch"
25-
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-neofetch"
25+
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-neofetch .description=System⠀information⠀display⠀tool⠀with⠀ASCII⠀art."
2626
# BR2_TARGET_ROOTFS_TAR is not set

configs/nftables_amd64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ BR2_TARGET_ROOTFS_OCI=y
2323
BR2_TARGET_ROOTFS_OCI_AUTHOR="curiOS"
2424
BR2_TARGET_ROOTFS_OCI_TAG="curios-nftables"
2525
BR2_TARGET_ROOTFS_OCI_ENTRYPOINT="/sbin/init"
26-
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-nftables"
26+
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-nftables .description=Advanced⠀containerized⠀firewall⠀with⠀netfilter⠀and⠀interface⠀management."
2727
# BR2_TARGET_ROOTFS_TAR is not set

configs/nftables_arm64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ BR2_TARGET_ROOTFS_OCI=y
2424
BR2_TARGET_ROOTFS_OCI_AUTHOR="curiOS"
2525
BR2_TARGET_ROOTFS_OCI_TAG="curios-nftables"
2626
BR2_TARGET_ROOTFS_OCI_ENTRYPOINT="/sbin/init"
27-
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-nftables"
27+
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-nftables .description=Advanced⠀containerized⠀firewall⠀with⠀netfilter⠀and⠀interface⠀management."
2828
# BR2_TARGET_ROOTFS_TAR is not set

configs/ntpd_amd64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ BR2_TARGET_ROOTFS_OCI_TAG="curios-ntpd"
2626
BR2_TARGET_ROOTFS_OCI_ENTRYPOINT="/usr/bin/tini --"
2727
BR2_TARGET_ROOTFS_OCI_CMD="/usr/sbin/ntpd -n -g"
2828
BR2_TARGET_ROOTFS_OCI_PORTS="123/udp"
29-
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-ntpd"
29+
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-ntpd .description=Precision⠀time⠀synchronization⠀daemon."
3030
# BR2_TARGET_ROOTFS_TAR is not set

configs/ntpd_arm64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ BR2_TARGET_ROOTFS_OCI_TAG="curios-ntpd"
2727
BR2_TARGET_ROOTFS_OCI_ENTRYPOINT="/usr/bin/tini --"
2828
BR2_TARGET_ROOTFS_OCI_CMD="/usr/sbin/ntpd -n -g"
2929
BR2_TARGET_ROOTFS_OCI_PORTS="123/udp"
30-
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-ntpd"
30+
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS-ntpd .description=Precision⠀time⠀synchronization⠀daemon."
3131
# BR2_TARGET_ROOTFS_TAR is not set

configs/system_amd64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ BR2_TARGET_ROOTFS_OCI_AUTHOR="curiOS"
4040
BR2_TARGET_ROOTFS_OCI_TAG="curios"
4141
BR2_TARGET_ROOTFS_OCI_ENTRYPOINT="/sbin/init"
4242
BR2_TARGET_ROOTFS_OCI_PORTS="22/tcp 161/tcp 161/udp"
43-
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS"
43+
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS .description=Full-featured⠀development⠀environment."
4444
# BR2_TARGET_ROOTFS_TAR is not set
4545
BR2_PACKAGE_MCJOIN=y
4646
BR2_PACKAGE_MPING=y

configs/system_arm64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ BR2_TARGET_ROOTFS_OCI_AUTHOR="curiOS"
4141
BR2_TARGET_ROOTFS_OCI_TAG="curios"
4242
BR2_TARGET_ROOTFS_OCI_ENTRYPOINT="/sbin/init"
4343
BR2_TARGET_ROOTFS_OCI_PORTS="22/tcp 161/tcp 161/udp"
44-
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS"
44+
BR2_TARGET_ROOTFS_OCI_LABELS=".url=https://github.com/kernelkit/curiOS .title=curiOS .description=Full-featured⠀development⠀environment."
4545
# BR2_TARGET_ROOTFS_TAR is not set
4646
BR2_PACKAGE_MCJOIN=y
4747
BR2_PACKAGE_MPING=y

0 commit comments

Comments
 (0)