diff --git a/meta-atp/conf/machine/gem5-atp-arm64.conf b/meta-atp/conf/machine/gem5-atp-arm64.conf index d5fe22a7..4d0adac8 100644 --- a/meta-atp/conf/machine/gem5-atp-arm64.conf +++ b/meta-atp/conf/machine/gem5-atp-arm64.conf @@ -5,7 +5,7 @@ MACHINEOVERRIDES =. "gem5-arm64:" GEM5_RUN_PROFILE = "configs/baremetal_atp.py" # Require m5term EXTRA_IMAGEDEPENDS += "gem5-m5term-native" -# Require ATP kernel modules, user API and gem5 m5ops -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-atp atp-uapi gem5-m5ops" +# Require ATP kernel modules, user API and gem5 m5readfile +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-atp atp-uapi gem5-m5readfile" # Optionally provide ATP kernel tests MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "atp-test" diff --git a/meta-atp/recipes-devtools/gem5/gem5-m5ops_20.bbappend b/meta-atp/recipes-devtools/gem5/gem5-m5ops_20.bbappend deleted file mode 100644 index 3ba0c3ca..00000000 --- a/meta-atp/recipes-devtools/gem5/gem5-m5ops_20.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -inherit update-rc.d - -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -# Add startup script calling m5 readfile for automatic checkpoint and restore -SRC_URI += "file://m5-readfile.sh" - -INITSCRIPT_NAME = "m5-readfile.sh" -INITSCRIPT_PARAMS = "defaults 99" - -do_install:append() { - install -d ${D}/${INIT_D_DIR} - install -m 755 ${WORKDIR}/m5-readfile.sh ${D}/${INIT_D_DIR} -} diff --git a/meta-atp/recipes-devtools/gem5/gem5-m5readfile.bb b/meta-atp/recipes-devtools/gem5/gem5-m5readfile.bb new file mode 100644 index 00000000..9cddc270 --- /dev/null +++ b/meta-atp/recipes-devtools/gem5/gem5-m5readfile.bb @@ -0,0 +1,17 @@ +inherit update-rc.d + +SUMMARY = "Enables reading any script at simulation launch time" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" + +SRC_URI = "file://m5-readfile.sh" + +INITSCRIPT_NAME = "m5-readfile.sh" +INITSCRIPT_PARAMS = "defaults 99" + +do_install() { + install -d ${D}/${INIT_D_DIR} + install -m 755 ${WORKDIR}/m5-readfile.sh ${D}/${INIT_D_DIR} +} + +RDEPENDS:${PN} = "gem5-m5ops" diff --git a/meta-atp/recipes-devtools/gem5/gem5-m5ops/m5-readfile.sh b/meta-atp/recipes-devtools/gem5/gem5-m5readfile/m5-readfile.sh similarity index 65% rename from meta-atp/recipes-devtools/gem5/gem5-m5ops/m5-readfile.sh rename to meta-atp/recipes-devtools/gem5/gem5-m5readfile/m5-readfile.sh index 44477e96..edf79b84 100755 --- a/meta-atp/recipes-devtools/gem5/gem5-m5ops/m5-readfile.sh +++ b/meta-atp/recipes-devtools/gem5/gem5-m5readfile/m5-readfile.sh @@ -3,7 +3,7 @@ # Provides: m5-readfile # Required-Start: $all # Default-Start: 5 -# Description: Enables reading any script at simulation launch time. +# Description: Enables reading any script at simulation launch time. ### END INIT INFO m5 readfile | sh