From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7278939938131804160 X-Received: by 2002:a2e:a7c7:0:b0:2c0:32e4:967b with SMTP id x7-20020a2ea7c7000000b002c032e4967bmr18206ljp.2.1695124606749; Tue, 19 Sep 2023 04:56:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a68a:0:b0:2bf:fb2c:fd70 with SMTP id q10-20020a2ea68a000000b002bffb2cfd70ls26236lje.2.-pod-prod-00-eu; Tue, 19 Sep 2023 04:56:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzaqO/XAZaDVNtFT7bgA2eVDh8yxB3Mf1eABiklthsELrtadIsmMUw0Pfn7ceWeeWffdXw X-Received: by 2002:a2e:b5c9:0:b0:2bf:fa16:3aa3 with SMTP id g9-20020a2eb5c9000000b002bffa163aa3mr830655ljn.25.1695124604612; Tue, 19 Sep 2023 04:56:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695124604; cv=none; d=google.com; s=arc-20160816; b=EgeLE51yr7qdJXTZL9AqnHI3m7iI8wDeDH1oY653WYMwYomHjQX9YB+M17JF/BxcB9 UHNpfKjNOIIR4JHbjY+f0HqCtQfl9L9YrVnwcgomKXtZcm74dwY8cQAwhlTAbCAwluAd DZrNfnEPrkfHQHyNDkD/gI19CzTj19c58orjecE7i90sxImpclCbFKBvny9rPO/3fub9 x0DlHmK9MozWuKVn49js5sSgcmXoLwQkuDXkccXM2uMfWh9z0lhqPIzMJkDf6Rqlqux9 q/WmgiRFoDn+uM8xBGp4Ksgw692lxPsLglOXl8PbMFiWEIQBs2RsS6j/hPbOJtPQ8jxB Iyew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=QnexjxJWi5X6I8B0qFMWmFRFNWm1/IEhqmulqQa+K8E=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=hhOgFkba4RLHEHSVHWXgbwyTytWuxhZWfm5YohWruRH4rfFiGeO/AHBjMA53bd1nVA /M/qpmv2jtqJOB2eA/gcAvbOiJfKZT8fOIZlPI/yC33thSFHVRLsmdAggKBUUT43LHZU Etcm+2HkfmC/kMvzrJMfQ89L2bRyqX8J0hA5q7OHuiiN1ebIQuivZkoD2Ju6o82I730n FMMcdZckmXF2weoqbJ2bv1cmHGx+OoBbh3fuO6HqakkC2WrS85ZnXd4lFKmXd4JRbP2l JTMfNo2vfS1RjSxd3GfYenSYwL4KKV/J6twxrTIMdJcd/SpZ1RckY59EGav9ED9qks+y luLQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id s14-20020a2e81ce000000b002bb9bc937aesi1154047ljg.8.2023.09.19.04.56.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Sep 2023 04:56:44 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 38JBueG9015357 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 19 Sep 2023 13:56:43 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 04/12] kas: Add packages selection Date: Tue, 19 Sep 2023 13:56:32 +0200 Message-Id: <20230919115640.18398-5-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230919115640.18398-1-ubely@ilbers.de> References: <20230919115640.18398-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: NUGQKTHBlMgN This part of configuration allows to choose which additional packages (both from Isar and Debian) to include to the target image. Isar packages are added to IMAGE_INSTALL since Debian packages go to IMAGE_PREINSTALL. The features are implemented as "string" parameter in the menu since it reduces a number of required YAML fragments. Signed-off-by: Uladzimir Bely --- Kconfig | 1 + kas/opt/packages-distro.yaml | 6 + kas/opt/packages-isar.yaml | 6 + kas/package/Kconfig | 148 ++++++++++++++++++++ kas/package/packages-distro.yaml | 6 + kas/package/pkg_cowsay.yaml | 6 + kas/package/pkg_enable-fsck.yaml | 6 + kas/package/pkg_example-module.yaml | 6 + kas/package/pkg_example-prebuilt.yaml | 6 + kas/package/pkg_example-raw.yaml | 6 + kas/package/pkg_expand-on-first-boot.yaml | 6 + kas/package/pkg_hello-isar.yaml | 6 + kas/package/pkg_hello.yaml | 6 + kas/package/pkg_isar-disable-apt-cache.yaml | 6 + kas/package/pkg_isar-exclude-docs.yaml | 6 + kas/package/pkg_kselftest.yaml | 6 + kas/package/pkg_samefile.yaml | 6 + kas/package/pkg_sshd-regen-keys.yaml | 6 + 18 files changed, 245 insertions(+) create mode 100644 kas/opt/packages-distro.yaml create mode 100644 kas/opt/packages-isar.yaml create mode 100644 kas/package/Kconfig create mode 100644 kas/package/packages-distro.yaml create mode 100644 kas/package/pkg_cowsay.yaml create mode 100644 kas/package/pkg_enable-fsck.yaml create mode 100644 kas/package/pkg_example-module.yaml create mode 100644 kas/package/pkg_example-prebuilt.yaml create mode 100644 kas/package/pkg_example-raw.yaml create mode 100644 kas/package/pkg_expand-on-first-boot.yaml create mode 100644 kas/package/pkg_hello-isar.yaml create mode 100644 kas/package/pkg_hello.yaml create mode 100644 kas/package/pkg_isar-disable-apt-cache.yaml create mode 100644 kas/package/pkg_isar-exclude-docs.yaml create mode 100644 kas/package/pkg_kselftest.yaml create mode 100644 kas/package/pkg_samefile.yaml create mode 100644 kas/package/pkg_sshd-regen-keys.yaml diff --git a/Kconfig b/Kconfig index f48c56cf..0d54ea52 100644 --- a/Kconfig +++ b/Kconfig @@ -10,4 +10,5 @@ config KAS_BUILD_SYSTEM source "kas/distro/Kconfig" source "kas/machine/Kconfig" +source "kas/package/Kconfig" source "kas/opt/Kconfig" diff --git a/kas/opt/packages-distro.yaml b/kas/opt/packages-distro.yaml new file mode 100644 index 00000000..d2fca914 --- /dev/null +++ b/kas/opt/packages-distro.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + packages-distro: | + IMAGE_PREINSTALL:append = " ${KAS_IMAGE_PREINSTALL}" diff --git a/kas/opt/packages-isar.yaml b/kas/opt/packages-isar.yaml new file mode 100644 index 00000000..c8da258d --- /dev/null +++ b/kas/opt/packages-isar.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + packages-isar: | + IMAGE_INSTALL:append = " ${KAS_IMAGE_INSTALL}" diff --git a/kas/package/Kconfig b/kas/package/Kconfig new file mode 100644 index 00000000..a5531167 --- /dev/null +++ b/kas/package/Kconfig @@ -0,0 +1,148 @@ +menu "Packages selection" + +menu "Isar packages" + +config PACKAGE_COWSAY + bool "cowsay" + default y + +config KAS_INCLUDE_PACKAGE_COWSAY + string + default "kas/package/pkg_cowsay.yaml" + depends on PACKAGE_COWSAY + + +config PACKAGE_ENABLE_FSCK + bool "enable-fsck" + default y + +config KAS_INCLUDE_PACKAGE_ENABLE_FSCK + string + default "kas/package/pkg_enable-fsck.yaml" + depends on PACKAGE_ENABLE_FSCK + + +config PACKAGE_EXAMPLE_RAW + bool "example-raw" + default y + +config KAS_INCLUDE_PACKAGE_EXAMPLE_RAW + string + default "kas/package/pkg_example-raw.yaml" + depends on PACKAGE_EXAMPLE_RAW + + +config PACKAGE_EXAMPLE_MODULE + bool "example-module" + default y + +config KAS_INCLUDE_PACKAGE_EXAMPLE_MODULE + string + default "kas/package/pkg_example-module.yaml" + depends on PACKAGE_EXAMPLE_MODULE + + +config PACKAGE_EXAMPLE_PREBUILT + bool "example-prebuilt" + default y + +config KAS_INCLUDE_PACKAGE_EXAMPLE_PREBUILT + string + default "kas/package/pkg_example-prebuilt.yaml" + depends on PACKAGE_EXAMPLE_PREBUILT + + +config PACKAGE_EXPAND_ON_FIRST_BOOT + bool "expand-on-first-boot" + default y + +config KAS_INCLUDE_PACKAGE_EXPAND_ON_FIRST_BOOT + string + default "kas/package/pkg_expand-on-first-boot.yaml" + depends on PACKAGE_EXPAND_ON_FIRST_BOOT + + +config PACKAGE_HELLO + bool "hello" + default y + +config KAS_INCLUDE_PACKAGE_HELLO + string + default "kas/package/pkg_hello.yaml" + depends on PACKAGE_HELLO + + +config PACKAGE_HELLO_ISAR + bool "hello-isar" + default y + +config KAS_INCLUDE_PACKAGE_HELLO_ISAR + string + default "kas/package/pkg_hello-isar.yaml" + depends on PACKAGE_HELLO_ISAR + + +config PACKAGE_ISAR_EXCLUDE_DOCS + bool "isar-exclude-docs" + default y + +config KAS_INCLUDE_PACKAGE_ISAR_EXCLUDE_DOCS + string + default "kas/package/pkg_isar-exclude-docs.yaml" + depends on PACKAGE_ISAR_EXCLUDE_DOCS + + +config PACKAGE_ISAR_DISABLE_APT_CACHE + bool "isar-disable-apt-cache" + default y + +config KAS_INCLUDE_PACKAGE_ISAR_DISABLE_APT_CACHE + string + default "kas/package/pkg_isar-disable-apt-cache.yaml" + depends on PACKAGE_ISAR_DISABLE_APT_CACHE + + +config PACKAGE_KSELFTEST + bool "kselftest" + default n + +config KAS_INCLUDE_PACKAGE_KSELFTEST + string + default "kas/package/pkg_kselftest.yaml" + depends on PACKAGE_KSELFTEST + + +config PACKAGE_SAMEFILE + bool "samefile" + default y + +config KAS_INCLUDE_PACKAGE_SAMEFILE + string + default "kas/package/pkg_samefile.yaml" + depends on PACKAGE_SAMEFILE + + +config PACKAGE_SSHD_REGEN_KEYS + bool "sshd-regen-keys" + default y + +config KAS_INCLUDE_PACKAGE_SSHD_REGEN_KEYS + string + default "kas/package/pkg_sshd-regen-keys.yaml" + depends on PACKAGE_SSHD_REGEN_KEYS + +endmenu + +config KAS_IMAGE_PREINSTALL + string "Distro packages" + default "fdisk iproute2 iputils-ping ics-dhcp-client" + help + Space-separated list of packages that are provided by the selected distro. + These packages are downloaded from distro mirrors and just unpacked + and configured by Isar. + +config KAS_INCLUDE_PACKAGES_DISTRO + string + default "kas/package/packages-distro.yaml" + +endmenu diff --git a/kas/package/packages-distro.yaml b/kas/package/packages-distro.yaml new file mode 100644 index 00000000..d2fca914 --- /dev/null +++ b/kas/package/packages-distro.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + packages-distro: | + IMAGE_PREINSTALL:append = " ${KAS_IMAGE_PREINSTALL}" diff --git a/kas/package/pkg_cowsay.yaml b/kas/package/pkg_cowsay.yaml new file mode 100644 index 00000000..8d647032 --- /dev/null +++ b/kas/package/pkg_cowsay.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-cowsay: | + IMAGE_INSTALL:append = " cowsay" diff --git a/kas/package/pkg_enable-fsck.yaml b/kas/package/pkg_enable-fsck.yaml new file mode 100644 index 00000000..2b2770ea --- /dev/null +++ b/kas/package/pkg_enable-fsck.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-enable-fsck: | + IMAGE_INSTALL:append = " enable-fsck" diff --git a/kas/package/pkg_example-module.yaml b/kas/package/pkg_example-module.yaml new file mode 100644 index 00000000..e9d84b06 --- /dev/null +++ b/kas/package/pkg_example-module.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-example-module: | + IMAGE_INSTALL:append = " example-module-${KERNEL_NAME}" diff --git a/kas/package/pkg_example-prebuilt.yaml b/kas/package/pkg_example-prebuilt.yaml new file mode 100644 index 00000000..0489448d --- /dev/null +++ b/kas/package/pkg_example-prebuilt.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-example-prebuilt: | + IMAGE_INSTALL:append = " example-prebuilt" diff --git a/kas/package/pkg_example-raw.yaml b/kas/package/pkg_example-raw.yaml new file mode 100644 index 00000000..cd5d6811 --- /dev/null +++ b/kas/package/pkg_example-raw.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-example-raw: | + IMAGE_INSTALL:append = " example-raw" diff --git a/kas/package/pkg_expand-on-first-boot.yaml b/kas/package/pkg_expand-on-first-boot.yaml new file mode 100644 index 00000000..e54812e6 --- /dev/null +++ b/kas/package/pkg_expand-on-first-boot.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-expand-on-first-boot: | + IMAGE_INSTALL:append = " expand-on-first-boot" diff --git a/kas/package/pkg_hello-isar.yaml b/kas/package/pkg_hello-isar.yaml new file mode 100644 index 00000000..20372daf --- /dev/null +++ b/kas/package/pkg_hello-isar.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-hello-isar: | + IMAGE_INSTALL:append = " hello-isar" diff --git a/kas/package/pkg_hello.yaml b/kas/package/pkg_hello.yaml new file mode 100644 index 00000000..f6cf2a97 --- /dev/null +++ b/kas/package/pkg_hello.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-hello: | + IMAGE_INSTALL:append = " hello" diff --git a/kas/package/pkg_isar-disable-apt-cache.yaml b/kas/package/pkg_isar-disable-apt-cache.yaml new file mode 100644 index 00000000..497c48b0 --- /dev/null +++ b/kas/package/pkg_isar-disable-apt-cache.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-isar-disable-apt-cache: | + IMAGE_INSTALL:append = " isar-disable-apt-cache" diff --git a/kas/package/pkg_isar-exclude-docs.yaml b/kas/package/pkg_isar-exclude-docs.yaml new file mode 100644 index 00000000..34c761d6 --- /dev/null +++ b/kas/package/pkg_isar-exclude-docs.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-isar-exclude-docs: | + IMAGE_INSTALL:append = " isar-exclude-docs" diff --git a/kas/package/pkg_kselftest.yaml b/kas/package/pkg_kselftest.yaml new file mode 100644 index 00000000..ba925111 --- /dev/null +++ b/kas/package/pkg_kselftest.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-kselftest: | + IMAGE_INSTALL:append = " kselftest" diff --git a/kas/package/pkg_samefile.yaml b/kas/package/pkg_samefile.yaml new file mode 100644 index 00000000..b5edaa22 --- /dev/null +++ b/kas/package/pkg_samefile.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-samefile: | + IMAGE_INSTALL:append = " samefile" diff --git a/kas/package/pkg_sshd-regen-keys.yaml b/kas/package/pkg_sshd-regen-keys.yaml new file mode 100644 index 00000000..f14e2a12 --- /dev/null +++ b/kas/package/pkg_sshd-regen-keys.yaml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + package-sshd-regen-keys: | + IMAGE_INSTALL:append = " sshd-regen-keys" -- 2.20.1