diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff b/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff new file mode 100644 index 000000000..8a3fc9912 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff @@ -0,0 +1,27 @@ +From cb3e98e17a666896150b109694e9eb9278620845 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Sat, 17 May 2014 14:57:01 +0300 +Subject: Skip a regeneration check in unrelated git repositories + +If the test is run in a git repository without lib/.gitignore, +for instance because the repository only imported the Perl tarball, +the regeneration check is broken because lib/.gitignore is missing. + +Patch-Name: debian/regen-skip.diff +--- + regen/lib_cleanup.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/regen/lib_cleanup.pl b/regen/lib_cleanup.pl +index c9d6e43..fece1ed 100644 +--- a/regen/lib_cleanup.pl ++++ b/regen/lib_cleanup.pl +@@ -159,7 +159,7 @@ foreach ('win32/Makefile', 'win32/makefile.mk') { + } + + # This must come last as it can exit early: +-if ($TAP && !-d '.git' && !-f 'lib/.gitignore') { ++if ($TAP && !-d '.git' || !-f 'lib/.gitignore') { + print "ok # skip not being run from a git checkout, hence no lib/.gitignore\n"; + exit 0; + } |