aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Randle <william.c.randle@intel.com>2016-06-04 15:45:01 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 15:26:37 +0100
commit3f828924d2e4c2ac8423e40a693c4bca19b514f7 (patch)
tree268dd97c41358e8eb36fae0b9fba032f6b4eb513
parentc53820180cdccd97de1f314078570fac1ff16052 (diff)
downloadopenembedded-core-contrib-3f828924d2e4c2ac8423e40a693c4bca19b514f7.tar.gz
perl: set proper perl subversion number in config files
During the upgrade from Perl 5.22.0 to 5.22.1 in commit f4c9908eae1ae3dcc38877abe2d5fbeb46851dd4 the config.sh file was hand edited to change the subversion numbers. However, the edit was not entirely correct. As a result the Perl version test failed. Set the correct version strings. [YOCTO #8656] (From OE-Core rev: 6e06fec1ca71979e361d8a6e35ef4ec442e71881) Signed-off-by: Bill Randle <william.c.randle@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/recipes-devtools/perl/perl/config.sh10
-rwxr-xr-xmeta/recipes-devtools/perl/perl/perl-configure.sh2
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/perl/perl/config.sh b/meta/recipes-devtools/perl/perl/config.sh
index 59e016e4dc..b2a7f2cc4c 100644
--- a/meta/recipes-devtools/perl/perl/config.sh
+++ b/meta/recipes-devtools/perl/perl/config.sh
@@ -8,7 +8,7 @@
# Package name : perl5
# Source directory : .
-# Configuration time: Thu Jun 18 05:37:27 UTC 2015
+# Configuration time: Fri May 6 20:13:46 PDT 2016
# Configured by : Open Embedded
# Target system : linux qemux86-64 3.19.5-yocto-standard #1 smp preempt tue jun 16 00:28:17 pdt 2015 x86_64 gnulinux
@@ -66,7 +66,7 @@ aphostname=''
api_revision='5'
api_subversion='0'
api_version='22'
-api_versionstring='5.22.1'
+api_versionstring='5.22.0'
ar='ar'
archlib='@LIBDIR@/perl/5.22.1/@ARCH@-thread-multi'
archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.22.1/@ARCH@-thread-multi'
@@ -96,7 +96,7 @@ ccsymbols=''
ccversion=''
cf_by='Open Embedded'
cf_email='Open Embedded@localhost.localdomain'
-cf_time='Thu Jun 18 05:37:27 UTC 2015'
+cf_time='Fri May 6 20:13:46 PDT 2016'
charbits='8'
charsize='1'
chgrp=''
@@ -1194,7 +1194,7 @@ vendorprefixexp='@EXECPREFIX@'
vendorscript='@USRBIN@'
vendorscriptexp='@USRBIN@'
version='5.22.1'
-version_patchlevel_string='version 22 subversion 0'
+version_patchlevel_string='version 22 subversion 1'
versiononly='undef'
vi=''
xlibpth='@LIBDIR@/386 @BASELIBDIR@386'
@@ -1204,7 +1204,7 @@ zcat=''
zip='zip'
PERL_REVISION=5
PERL_VERSION=22
-PERL_SUBVERSION=0
+PERL_SUBVERSION=1
PERL_API_REVISION=5
PERL_API_VERSION=22
PERL_API_SUBVERSION=0
diff --git a/meta/recipes-devtools/perl/perl/perl-configure.sh b/meta/recipes-devtools/perl/perl/perl-configure.sh
index e72ce49f99..25e7f8b96b 100755
--- a/meta/recipes-devtools/perl/perl/perl-configure.sh
+++ b/meta/recipes-devtools/perl/perl/perl-configure.sh
@@ -15,7 +15,7 @@ echo sh Configure -des \
-Dprefix=/usr \
-Dvendorprefix=/usr \
-Dsiteprefix=/usr \
- -Dotherlibdirs=/usr/lib/perl5/5.12.3 \
+ -Dotherlibdirs=/usr/lib/perl5/5.22.1 \
-Duseshrplib \
-Dusethreads \
-Duseithreads \