* Re: [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3 [not found] <20120726135324.6971710217@opal> @ 2012-07-27 11:05 ` Martin Jansa 2012-07-27 11:07 ` [PATCH] ppp: bump PR to rebuild against libpcap1 instead libpcap Martin Jansa 2012-07-27 11:52 ` [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3 Martin Jansa 0 siblings, 2 replies; 6+ messages in thread From: Martin Jansa @ 2012-07-27 11:05 UTC (permalink / raw) To: openembedded-core, Cristian Iorga; +Cc: openembedded-commits [-- Attachment #1: Type: text/plain, Size: 3052 bytes --] On Thu, Jul 26, 2012 at 01:53:24PM +0000, git@git.openembedded.org wrote: > Module: openembedded-core.git > Branch: master > Commit: 3f0cc742ea5d4788df26bb0592c294e5a67e1093 > URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3f0cc742ea5d4788df26bb0592c294e5a67e1093 > > Author: Cristian Iorga <cristian.iorga@intel.com> > Date: Tue Jul 24 08:36:57 2012 +0300 > > libpcap: upgrade to ver. 1.3 > > Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> > Signed-off-by: Saul Wold <sgw@linux.intel.com> This changes .so version so now libpcap package is renamed to libpcap1 and breaks at least ppp and tcpdump recipes: /OE/openembedded-core/meta/recipes-connectivity/ppp/ppp_2.4.5.bb /OE/meta-openembedded/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb I'll send PR bumps for those 2, but maybe there are more recipes depending on now non-existent libpcap. Cheers, > --- > > .../{libpcap-1.2.1 => libpcap-1.3.0}/aclocal.patch | 0 > .../ieee80215-arphrd.patch | 0 > .../libpcap/{libpcap_1.2.1.bb => libpcap_1.3.0.bb} | 4 ++-- > 3 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.2.1/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch > similarity index 100% > rename from meta/recipes-connectivity/libpcap/libpcap-1.2.1/aclocal.patch > rename to meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch > diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.2.1/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch > similarity index 100% > rename from meta/recipes-connectivity/libpcap/libpcap-1.2.1/ieee80215-arphrd.patch > rename to meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch > diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb > similarity index 73% > rename from meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb > rename to meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb > index 91bedf7..717e0e8 100644 > --- a/meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb > +++ b/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb > @@ -5,8 +5,8 @@ PR = "${INC_PR}.0" > SRC_URI += "file://aclocal.patch \ > file://ieee80215-arphrd.patch" > > -SRC_URI[md5sum] = "06046e0e81efc60566daf1cc96c77d46" > -SRC_URI[sha256sum] = "a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd" > +SRC_URI[md5sum] = "f78455a92622b7a3c05c58b6ad1cec7e" > +SRC_URI[sha256sum] = "41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9" > > # > # make install doesn't cover the shared lib > > > _______________________________________________ > Openembedded-commits mailing list > Openembedded-commits@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ppp: bump PR to rebuild against libpcap1 instead libpcap 2012-07-27 11:05 ` [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3 Martin Jansa @ 2012-07-27 11:07 ` Martin Jansa 2012-07-29 9:22 ` Richard Purdie 2012-07-27 11:52 ` [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3 Martin Jansa 1 sibling, 1 reply; 6+ messages in thread From: Martin Jansa @ 2012-07-27 11:07 UTC (permalink / raw) To: openembedded-core Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb index 587871a..6af4e98 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" -PR = "r5" +PR = "r6" SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://makefile.patch \ -- 1.7.8.6 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ppp: bump PR to rebuild against libpcap1 instead libpcap 2012-07-27 11:07 ` [PATCH] ppp: bump PR to rebuild against libpcap1 instead libpcap Martin Jansa @ 2012-07-29 9:22 ` Richard Purdie 0 siblings, 0 replies; 6+ messages in thread From: Richard Purdie @ 2012-07-29 9:22 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Fri, 2012-07-27 at 13:07 +0200, Martin Jansa wrote: > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Merged to master, thanks. Richard ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3 2012-07-27 11:05 ` [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3 Martin Jansa 2012-07-27 11:07 ` [PATCH] ppp: bump PR to rebuild against libpcap1 instead libpcap Martin Jansa @ 2012-07-27 11:52 ` Martin Jansa 2012-07-27 12:05 ` Phil Blundell 1 sibling, 1 reply; 6+ messages in thread From: Martin Jansa @ 2012-07-27 11:52 UTC (permalink / raw) To: openembedded-core, Cristian Iorga; +Cc: openembedded-commits [-- Attachment #1: Type: text/plain, Size: 4315 bytes --] On Fri, Jul 27, 2012 at 01:05:21PM +0200, Martin Jansa wrote: > On Thu, Jul 26, 2012 at 01:53:24PM +0000, git@git.openembedded.org wrote: > > Module: openembedded-core.git > > Branch: master > > Commit: 3f0cc742ea5d4788df26bb0592c294e5a67e1093 > > URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3f0cc742ea5d4788df26bb0592c294e5a67e1093 > > > > Author: Cristian Iorga <cristian.iorga@intel.com> > > Date: Tue Jul 24 08:36:57 2012 +0300 > > > > libpcap: upgrade to ver. 1.3 > > > > Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> > > Signed-off-by: Saul Wold <sgw@linux.intel.com> > > This changes .so version so now libpcap package is renamed to libpcap1 > and breaks at least ppp and tcpdump recipes: > > /OE/openembedded-core/meta/recipes-connectivity/ppp/ppp_2.4.5.bb > /OE/meta-openembedded/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb > > I'll send PR bumps for those 2, but maybe there are more recipes > depending on now non-existent libpcap. And even with those PR bumps, upgrade path is broken and needs manuall step Upgrading tcpdump on root from 4.1.1-r1 to 4.1.1-r2... Downloading http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/tcpdump_4.1.1-r2_armv4t.ipk. Installing libpcap1 (1.3.0-r2.0) to root... Downloading http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/libpcap1_1.3.0-r2.0_armv4t.ipk. Upgrading ppp on root from 2.4.5-r5 to 2.4.5-r6... Downloading http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/ppp_2.4.5-r6_armv4t.ipk. Installing libpcap1 (1.3.0-r2.0) to root... Collected errors: * check_data_file_clashes: Package libpcap1 wants to install file /usr/lib/libpcap.so.1 But that file is already provided by package * libpcap * check_data_file_clashes: Package libpcap1 wants to install file /usr/lib/libpcap.so.1 But that file is already provided by package * libpcap RREPLACES_${PN} += "libpcap" would probably help in this case. Cheers, > > Cheers, > > > --- > > > > .../{libpcap-1.2.1 => libpcap-1.3.0}/aclocal.patch | 0 > > .../ieee80215-arphrd.patch | 0 > > .../libpcap/{libpcap_1.2.1.bb => libpcap_1.3.0.bb} | 4 ++-- > > 3 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.2.1/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch > > similarity index 100% > > rename from meta/recipes-connectivity/libpcap/libpcap-1.2.1/aclocal.patch > > rename to meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch > > diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.2.1/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch > > similarity index 100% > > rename from meta/recipes-connectivity/libpcap/libpcap-1.2.1/ieee80215-arphrd.patch > > rename to meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch > > diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb > > similarity index 73% > > rename from meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb > > rename to meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb > > index 91bedf7..717e0e8 100644 > > --- a/meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb > > +++ b/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb > > @@ -5,8 +5,8 @@ PR = "${INC_PR}.0" > > SRC_URI += "file://aclocal.patch \ > > file://ieee80215-arphrd.patch" > > > > -SRC_URI[md5sum] = "06046e0e81efc60566daf1cc96c77d46" > > -SRC_URI[sha256sum] = "a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd" > > +SRC_URI[md5sum] = "f78455a92622b7a3c05c58b6ad1cec7e" > > +SRC_URI[sha256sum] = "41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9" > > > > # > > # make install doesn't cover the shared lib > > > > > > _______________________________________________ > > Openembedded-commits mailing list > > Openembedded-commits@lists.openembedded.org > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits > > -- > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3 2012-07-27 11:52 ` [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3 Martin Jansa @ 2012-07-27 12:05 ` Phil Blundell 2012-07-27 12:13 ` Martin Jansa 0 siblings, 1 reply; 6+ messages in thread From: Phil Blundell @ 2012-07-27 12:05 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Fri, 2012-07-27 at 13:52 +0200, Martin Jansa wrote: > * check_data_file_clashes: Package libpcap1 wants to install file /usr/lib/libpcap.so.1 > But that file is already provided by package * libpcap > * check_data_file_clashes: Package libpcap1 wants to install file /usr/lib/libpcap.so.1 > But that file is already provided by package * libpcap If the old library was also libpcap.so.1, why has the package name changed? You said in your first mail that the patch "changes .so version" but if that was the case then there oughtn't to have been a file conflict here. p. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3 2012-07-27 12:05 ` Phil Blundell @ 2012-07-27 12:13 ` Martin Jansa 0 siblings, 0 replies; 6+ messages in thread From: Martin Jansa @ 2012-07-27 12:13 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 1245 bytes --] On Fri, Jul 27, 2012 at 01:05:43PM +0100, Phil Blundell wrote: > On Fri, 2012-07-27 at 13:52 +0200, Martin Jansa wrote: > > * check_data_file_clashes: Package libpcap1 wants to install file /usr/lib/libpcap.so.1 > > But that file is already provided by package * libpcap > > * check_data_file_clashes: Package libpcap1 wants to install file /usr/lib/libpcap.so.1 > > But that file is already provided by package * libpcap > > If the old library was also libpcap.so.1, why has the package name > changed? You said in your first mail that the patch "changes .so > version" but if that was the case then there oughtn't to have been a > file conflict here. True, I haven't seen this error before sending my first reply. So I've assumed that it was libpcap0 before and I was wrong. The real reason for package rename was that before this upgrade libpcap package contained also pcap-config (so debian naming wasn't used): http://git.shr-project.org/git/?p=buildhistory.git;a=commitdiff;h=85dae3abafee082905ffb5b9f1a2072e8f3eb047#patch190 Once again https://bugzilla.yoctoproject.org/show_bug.cgi?id=2787 proves to be usefull.. Cheers, -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-07-29 9:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20120726135324.6971710217@opal>
2012-07-27 11:05 ` [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3 Martin Jansa
2012-07-27 11:07 ` [PATCH] ppp: bump PR to rebuild against libpcap1 instead libpcap Martin Jansa
2012-07-29 9:22 ` Richard Purdie
2012-07-27 11:52 ` [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3 Martin Jansa
2012-07-27 12:05 ` Phil Blundell
2012-07-27 12:13 ` Martin Jansa
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox