Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024 11 22 master next fix firecracker jailer #10487

Merged
merged 2 commits into from
Nov 22, 2024
Merged

2024 11 22 master next fix firecracker jailer #10487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac407cd
firecracker, jailer -bin: UNPACKDIR
thomas-roos Nov 22, 2024
d41ec08
firecracker, jailer -bin: upgrade 1.3.3. -> 1.10.1
thomas-roos Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .../firecracker-bin/firecracker-bin_1.3.3.bb → ...firecracker-bin/firecracker-bin_1.10.1.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ HOMEPAGE = "https://firecracker-microvm.github.io/"
CVE_PRODUCT = "firecracker"
LICENSE = "Apache-2.0"
# nooelint: oelint.var.licenseremotefile:License-File
LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}/release-v${PV}-${TARGET_ARCH}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

ARCH_DIR:x86-64 = "x86_64"
ARCH_DIR:aarch64 = "aarch64"
Expand All @@ -14,10 +14,10 @@ COMPATIBLE_MACHINE:aarch64 = "(.*)"
COMPATIBLE_MACHINE:x86-64 = "(.*)"

# nooelint: oelint.vars.srcurichecksum
SRC_URI = "https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-${ARCH_DIR}.tgz;subdir=${BPN};name=${ARCH_DIR}"
SRC_URI = "https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-${ARCH_DIR}.tgz;name=${ARCH_DIR}"

SRC_URI[x86_64.sha256sum] = "f0095e359a31de37c8a1934162ec448dd7fad0dbefd68a536ad11ec382fe4fe0"
SRC_URI[aarch64.sha256sum] = "0dbb6577260b4c5d7e6526530e85c4d1d80b262d9a4f7c59fb37d6d60a1f2c54"
SRC_URI[x86_64.sha256sum] = "36112969952b0e34fadcfca769d48a55dc22cbba99af17e02bd0e24fc35adc77"
SRC_URI[aarch64.sha256sum] = "9e3641071de140979afaac0c52fdc107baeba398bdb5709c12f77ee469207fcd"

UPSTREAM_CHECK_REGEX ?= "releases/tag/v?(?P<pver>\d+(\.\d+)+)"

Expand All @@ -27,7 +27,7 @@ SRC_URI:append = " \
file://run-ptest \
"

S = "${WORKDIR}/${PN}"
S = "${UNPACKDIR}/release-v${PV}-${TARGET_ARCH}"

inherit bin_package ptest

Expand All @@ -42,7 +42,7 @@ FILES:${PN} += "\
do_install() {
install -d ${D}${bindir}

install -m 0755 ${S}/release-v${PV}-${TARGET_ARCH}/firecracker-v${PV}-${TARGET_ARCH} ${D}${bindir}/firecracker
install -m 0755 ${S}/firecracker-v${PV}-${TARGET_ARCH} ${D}${bindir}/firecracker
}

# https://bugzilla.yoctoproject.org/show_bug.cgi?id=15227
Expand Down
12 changes: 6 additions & 6 deletions ...iners/firecracker-bin/jailer-bin_1.3.3.bb → ...ners/firecracker-bin/jailer-bin_1.10.1.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ HOMEPAGE = "https://firecracker-microvm.github.io/"
CVE_PRODUCT = "jailer"
LICENSE = "Apache-2.0"
# nooelint: oelint.var.licenseremotefile:License-File
LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}/release-v${PV}-${TARGET_ARCH}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

ARCH_DIR:x86-64 = "x86_64"
ARCH_DIR:aarch64 = "aarch64"
Expand All @@ -14,10 +14,10 @@ COMPATIBLE_MACHINE:aarch64 = "(.*)"
COMPATIBLE_MACHINE:x86-64 = "(.*)"

# nooelint: oelint.vars.srcurichecksum
SRC_URI = "https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-${ARCH_DIR}.tgz;subdir=${BPN};name=${ARCH_DIR}"
SRC_URI = "https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-${ARCH_DIR}.tgz;name=${ARCH_DIR}"

SRC_URI[x86_64.sha256sum] = "f0095e359a31de37c8a1934162ec448dd7fad0dbefd68a536ad11ec382fe4fe0"
SRC_URI[aarch64.sha256sum] = "0dbb6577260b4c5d7e6526530e85c4d1d80b262d9a4f7c59fb37d6d60a1f2c54"
SRC_URI[x86_64.sha256sum] = "36112969952b0e34fadcfca769d48a55dc22cbba99af17e02bd0e24fc35adc77"
SRC_URI[aarch64.sha256sum] = "9e3641071de140979afaac0c52fdc107baeba398bdb5709c12f77ee469207fcd"

UPSTREAM_CHECK_REGEX ?= "releases/tag/v?(?P<pver>\d+(\.\d+)+)"

Expand All @@ -27,7 +27,7 @@ SRC_URI:append = " \
file://run-ptest \
"

S = "${WORKDIR}/${PN}"
S = "${UNPACKDIR}/release-v${PV}-${TARGET_ARCH}"

inherit bin_package ptest

Expand All @@ -45,7 +45,7 @@ RDEPENDS:${PN}-ptest += "\
do_install() {
install -d ${D}${bindir}

install -m 0755 ${S}/release-v${PV}-${TARGET_ARCH}/jailer-v${PV}-${TARGET_ARCH} ${D}${bindir}/jailer
install -m 0755 ${S}/jailer-v${PV}-${TARGET_ARCH} ${D}${bindir}/jailer
}

# https://bugzilla.yoctoproject.org/show_bug.cgi?id=15227
Expand Down
Loading