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/cpan-missing-site-dirs.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/cpan-missing-site-dirs.diff')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff b/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff new file mode 100644 index 000000000..a63b96831 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff @@ -0,0 +1,62 @@ +From d33d46963035ef726144dc66be2ae9c00aec0333 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Tue, 16 Oct 2012 23:07:56 +0300 +Subject: Fix CPAN::FirstTime defaults with nonexisting site dirs if a parent + is writable + +The site directories do not exist on a typical Debian system. The build +systems will create them when necessary, so there's no need for a prompt +suggesting local::lib if the first existing parent directory is writable. + +Also, writability of the core directories is not interesting as we +explicitly tell CPAN not to touch those with INSTALLDIRS=site. + +Bug-Debian: http://bugs.debian.org/688842 +Patch-Name: debian/cpan-missing-site-dirs.diff +--- + cpan/CPAN/lib/CPAN/FirstTime.pm | 31 +++++++++++++++++++++++++++---- + 1 file changed, 27 insertions(+), 4 deletions(-) + +diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm +index 33054cd..7b0becf 100644 +--- a/cpan/CPAN/lib/CPAN/FirstTime.pm ++++ b/cpan/CPAN/lib/CPAN/FirstTime.pm +@@ -2057,11 +2057,34 @@ sub _print_urllist { + }; + } + ++# Debian modification: return true if this directory ++# or the first existing one upwards is writable ++sub _can_write_to_this_or_parent { ++ my ($dir) = @_; ++ my @parts = File::Spec->splitdir($dir); ++ while (@parts) { ++ my $cur = File::Spec->catdir(@parts); ++ return 1 if -w $cur; ++ return 0 if -e _; ++ pop @parts; ++ } ++ return 0; ++} ++ ++# Debian specific modification: the site directories don't necessarily ++# exist on the system, but the build systems create them when necessary, ++# so return true if the first existing directory upwards is writable ++# ++# Furthermore, on Debian, only test the site directories ++# (installsite*, expanded to /usr/local/{share,lib}/perl), ++# not the core ones ++# (install*lib, expanded to /usr/{share,lib}/perl). ++# We pass INSTALLDIRS=site by default to keep CPAN from touching ++# the core directories. ++ + sub _can_write_to_libdirs { +- return -w $Config{installprivlib} +- && -w $Config{installarchlib} +- && -w $Config{installsitelib} +- && -w $Config{installsitearch} ++ return _can_write_to_this_or_parent($Config{installsitelib}) ++ && _can_write_to_this_or_parent($Config{installsitearch}) + } + + sub _using_installbase { |