meta-google: sslh: Ensure that autogenerated files aren't stale
These files sometimes get checked into the repo and we don't want
non-determinism around their generation. Ensure they are cleaned up and
regenerated for every build since that is very fast.
Change-Id: If20c79f8308c117a20983c8cb54c3420d872d64b
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/meta-google/recipes-extended/libconfig/conf2struct-native_git.bb b/meta-google/recipes-extended/libconfig/conf2struct-native_git.bb
index cf7f6f3..ab5c3d8 100644
--- a/meta-google/recipes-extended/libconfig/conf2struct-native_git.bb
+++ b/meta-google/recipes-extended/libconfig/conf2struct-native_git.bb
@@ -1,5 +1,5 @@
LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1b886630cdc9a17c26250934beda407d"
+LIC_FILES_CHKSUM = "file://COPYING;md5=667d4ad55f5fbf4c3e853e8acd0f74de"
PV = "0.1+git${SRCPV}"
SRC_URI = "git://github.com/yrutschle/conf2struct"
diff --git a/meta-google/recipes-extended/networking/sslh_git.bb b/meta-google/recipes-extended/networking/sslh_git.bb
index 16c8f32..ba26e29 100644
--- a/meta-google/recipes-extended/networking/sslh_git.bb
+++ b/meta-google/recipes-extended/networking/sslh_git.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
PV = "0.1+git${SRCPV}"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
@@ -7,6 +7,9 @@
SRCREV = "63f9c4a582f79f4d0e484efe0ccaeed77a79f7df"
S = "${WORKDIR}/git"
+inherit perlnative
+
+DEPENDS += "conf2struct-native"
DEPENDS += "libbsd"
DEPENDS += "libcap"
DEPENDS += "libconfig"
@@ -19,13 +22,13 @@
EXTRA_OEMAKE += "USELIBBSD=1"
EXTRA_OEMAKE += "USESYSTEMD=1"
-do_patch() {
- # Workaround timestamps of the source being later than the generated,
- # vendored output files. This non-determinism sometimes causes failures.
- sed -i '/conf2struct/d' ${S}/Makefile
+do_configure() {
+ oe_runmake distclean
}
do_compile() {
+ # Workaround for the broken dependencies in the Makefile
+ oe_runmake sslh-conf.h
oe_runmake
}