From a3766e464d3ce0e7a57b61b2cca369d4429baa34 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Tue, 6 Sep 2016 11:33:20 -0500 Subject: go-distribution-digest: Fix do_package failure The rule in the recipe which deletes all but LICENSE and the digest directory is broken depending on what ascii table bash uses by default for matching, specifically: rm -rf ${S}/[A-KM-Za-ce-z]* ${S}/doc* The "A-K" piece will actually match both upper and lower case when the acsii because the ascii value is checked as being between two numbers: 0x41=a, 0x42=A,0x43=b...0x48=D This is contray to what you would typically think should work with the lower and uppers separated into two contiguous spaces. To fix this, instead of using the "rm" logic, we can copy the components we need instead. Signed-off-by: Jason Wessel Signed-off-by: Bruce Ashfield --- recipes-devtools/go/go-distribution-digest_git.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'recipes-devtools') diff --git a/recipes-devtools/go/go-distribution-digest_git.bb b/recipes-devtools/go/go-distribution-digest_git.bb index 31d724ce..2a803da5 100644 --- a/recipes-devtools/go/go-distribution-digest_git.bb +++ b/recipes-devtools/go/go-distribution-digest_git.bb @@ -13,15 +13,13 @@ SRCREV = "d957768537c5af40e4f4cd96871f7b2bde9e2923" S = "${WORKDIR}/git" -do_unpackpost() { - rm -rf ${S}/[A-KM-Za-ce-z]* ${S}/doc* +# NO-OP the do compile rule because this recipe is source only. +do_compile() { } -addtask unpackpost after do_unpack before do_patch - do_install() { install -d ${D}${prefix}/local/go/src/${PKG_NAME} - cp -r ${S}/* ${D}${prefix}/local/go/src/${PKG_NAME}/ + cp -r ${S}/LICENSE ${S}/digest ${D}${prefix}/local/go/src/${PKG_NAME}/ } SYSROOT_PREPROCESS_FUNCS += "go_distribution_digeset_sysroot_preprocess" -- cgit v1.2.3-54-g00ecf