emmc-unavailable: move to common recipe We see that platforms without TH enabled, failed eMMC Lock because of missing this target. It's better to have this target just moved to emmc-available.bb which is there as long as a platforms enables eMMC. This does not affect platforms with TH disabled. Just a new target is there. Tested: bitbake emmc-available and TH worked. Shouldn't affect any functionality Google-Bug-Id: 464221969 Change-Id: If1ba3fe7c46a8976cf82743c57e2e3271f7dc1e9 Signed-off-by: Nan Zhou <nanzhou@google.com>
diff --git a/recipes-google/emmc/emmc-available.bb b/recipes-google/emmc/emmc-available.bb index fbbc483..b96027a 100644 --- a/recipes-google/emmc/emmc-available.bb +++ b/recipes-google/emmc/emmc-available.bb
@@ -10,12 +10,16 @@ SRC_URI += " \ file://emmc-available.target \ + file://emmc-unavailable.target \ " SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} += "emmc-available.target" +SYSTEMD_SERVICE:${PN} += "emmc-unavailable.target" + do_install:append() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/emmc-available.target ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/emmc-unavailable.target ${D}${systemd_system_unitdir} }
diff --git a/recipes-google/true-hitless/true-hitless/emmc-unavailable.target b/recipes-google/emmc/emmc-available/emmc-unavailable.target similarity index 100% rename from recipes-google/true-hitless/true-hitless/emmc-unavailable.target rename to recipes-google/emmc/emmc-available/emmc-unavailable.target
diff --git a/recipes-google/true-hitless/true-hitless.bb b/recipes-google/true-hitless/true-hitless.bb index 058681b..d4d4bf8 100644 --- a/recipes-google/true-hitless/true-hitless.bb +++ b/recipes-google/true-hitless/true-hitless.bb
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "" SRC_URI = " \ - file://emmc-unavailable.target \ file://emmc-available-postprocessing.service \ file://emmc-unavailable-postprocessing.service \ file://emmc-true-hitless-enable.sh \ @@ -29,7 +28,6 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = " \ - emmc-unavailable.target \ emmc-available-postprocessing.service \ emmc-unavailable-postprocessing.service \ true-hitless-initialize.service \ @@ -49,7 +47,6 @@ # Install systemd targets and services to /usr/lib/systemd/system (systemd_system_unitdir) install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/emmc-unavailable.target ${D}${systemd_system_unitdir} install -m 0644 ${S}/emmc-available-postprocessing.service ${D}${systemd_system_unitdir} install -m 0644 ${S}/emmc-unavailable-postprocessing.service ${D}${systemd_system_unitdir} install -m 0644 ${S}/true-hitless-initialize.service ${D}${systemd_system_unitdir}