diff --git a/kas/common.yml b/kas/common.yml index ec1736df..984d3606 100644 --- a/kas/common.yml +++ b/kas/common.yml @@ -21,6 +21,7 @@ repos: layers: meta-oe: meta-networking: + meta-filesystems: meta-python: meta-security: @@ -37,6 +38,10 @@ repos: url: https://github.com/zarhus/meta-coreboot refspec: c8254de6ee875ff4d8f7a3c91880c4d1ed9a7c6e + meta-virtualization: + url: https://git.yoctoproject.org/meta-virtualization + refspec: af1db2042caf8021d767dce1b26c08b59b96f3d1 + bblayers_conf_header: standard: | POKY_BBLAYERS_CONF_VERSION = "2" @@ -48,6 +53,7 @@ local_conf_header: CONF_VERSION = "2" PACKAGE_CLASSES = "package_rpm" SDKMACHINE = "x86_64" + SKIP_META_VIRT_SANITY_CHECK = "1" diskmon: | BB_DISKMON_DIRS = "\ STOPTASKS,${TMPDIR},1G,100K \ diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb index 1affc978..d7a27972 100644 --- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb +++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477 PV = "0.1+git${SRCPV}" -SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main" -SRCREV = "7b43513360816fc2171161b39c2a4bc79f88f487" +SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=tui-sh" +SRCREV = "508faf9e4e9f95d8f715adbd7d06866f4d9a8637" S = "${WORKDIR}/git" @@ -28,6 +28,8 @@ RDEPENDS:${PN} = " \ jq \ minio-cli \ dnf \ + make \ + tui-sh \ " do_configure[noexec] = "1" diff --git a/meta-dts-distro/recipes-dts/tui-sh/tui-sh_git.bb b/meta-dts-distro/recipes-dts/tui-sh/tui-sh_git.bb new file mode 100644 index 00000000..1d42b214 --- /dev/null +++ b/meta-dts-distro/recipes-dts/tui-sh/tui-sh_git.bb @@ -0,0 +1,27 @@ +SUMMARY = "TUI library" +HOMEPAGE = "https://github.com/3mdeb/tui-sh" +SECTION = "tools" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://github.com/3mdeb/tui-sh;protocol=https;branch=dts" +SRCREV = "7b65ae059d0ba088b24578aef1bb08a5620fc267" + +S = "${WORKDIR}/git" + +FILES:${PN} += "${libdir}/tui" +RDEPENDS:${PN} = " \ + bash \ + jq \ + yq \ +" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install () { + install -Dm 644 "${S}/lib/tui-lib.sh" "${D}${libdir}/tui/tui-lib.sh" +} diff --git a/scripts/remote-update.sh b/scripts/remote-update.sh index f5fabb8c..be04b96e 100755 --- a/scripts/remote-update.sh +++ b/scripts/remote-update.sh @@ -92,40 +92,7 @@ else SSH="ssh -p 5222" fi -$SSH -q "$REMOTE" mkdir -p /dts-scripts -$SCP -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r "$DTS_SCRIPTS"/{Makefile,dts-profile.sh,include,scripts,reports} "$REMOTE":/dts-scripts/ - -$SSH -q "$REMOTE" 'cat >/dts-scripts/update.sh' <<"EOF" -#!/bin/sh - -SBINDIR=/usr/sbin -SYSCONFDIR=/etc - -echo "Updating dts-scripts" - -install -d ${DESTDIR}${SBINDIR} - -install -m 0755 include/dts-environment.sh ${DESTDIR}${SBINDIR} -install -m 0755 include/dts-functions.sh ${DESTDIR}${SBINDIR} -install -m 0755 include/dts-subscription.sh ${DESTDIR}${SBINDIR} -install -m 0755 include/hal/dts-hal.sh ${DESTDIR}${SBINDIR} -install -m 0755 include/hal/common-mock-func.sh ${DESTDIR}${SBINDIR} - -install -m 0755 scripts/cloud_list.sh ${DESTDIR}${SBINDIR}/cloud_list -install -m 0755 scripts/dasharo-deploy.sh ${DESTDIR}${SBINDIR}/dasharo-deploy -install -m 0755 scripts/dts.sh ${DESTDIR}${SBINDIR}/dts -install -m 0755 scripts/dts-boot.sh ${DESTDIR}${SBINDIR}/dts-boot -install -m 0755 scripts/ec_transition.sh ${DESTDIR}${SBINDIR}/ec_transition -install -m 0755 scripts/logging.sh ${DESTDIR}${SBINDIR}/logging - -install -m 0755 reports/dasharo-hcl-report.sh ${DESTDIR}${SBINDIR}/dasharo-hcl-report -install -m 0755 reports/touchpad-info.sh ${DESTDIR}${SBINDIR}/touchpad-info - -install -d ${DESTDIR}${SYSCONFDIR}/profile.d -install -m 0755 dts-profile.sh ${DESTDIR}${SYSCONFDIR}/profile.d - -echo "Finished updating dts-scripts" -EOF - -$SSH -q "$REMOTE" chmod +x /dts-scripts/update.sh -$SSH -q "$REMOTE" 'cd /dts-scripts && ./update.sh' +$SSH -q "$REMOTE" mkdir -p /tmp/dts-scripts +$SCP -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ + -r "$DTS_SCRIPTS"/* "$REMOTE":/tmp/dts-scripts +$SSH -q "$REMOTE" 'cd /tmp/dts-scripts && make'