| Submitter | Saul Wold |
|---|---|
| Date | Oct. 23, 2011, 6:27 p.m. |
| Message ID | <dfc5efb4c54797a39c2471dfba7b7cbf14fb6476.1319394187.git.sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/13799/ |
| State | New, archived |
| Headers | show |
Comments
On Sun, 2011-10-23 at 11:27 -0700, Saul Wold wrote: > Signed-off-by: Saul Wold <sgw@linux.intel.com> > --- > meta-demoapps/recipes-gnome/abiword/abiword.inc | 4 ++-- > meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb | 10 ---------- > meta-demoapps/recipes-gnome/abiword/abiword_svn.bb | 10 ++++++++++ > 3 files changed, 12 insertions(+), 12 deletions(-) > delete mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb > create mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_svn.bb > > diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc > index b1b0f67..2b34a7a 100644 > --- a/meta-demoapps/recipes-gnome/abiword/abiword.inc > +++ b/meta-demoapps/recipes-gnome/abiword/abiword.inc > @@ -13,8 +13,8 @@ RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ > RELURI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" > RELSRC = "${WORKDIR}/abiword-${PV}/abi" > > -CVSURI = "cvs://anoncvs:anoncvs@anoncvs.abisource.com/cvsroot;module=abi" > -CVSSRC = "${WORKDIR}/abi" > +SVNURI = "cvs://svn.abisource.com/abiword/trunk;module=abiword;proto=http" > +SVNSRC = "${WORKDIR}/abi" > Er, its still using cvs:// ?! Cheers, Richard
On 10/24/2011 03:18 PM, Koen Kooi wrote: > > Op 24 okt. 2011, om 15:14 heeft Richard Purdie het volgende geschreven: > >> On Sun, 2011-10-23 at 11:27 -0700, Saul Wold wrote: >>> Signed-off-by: Saul Wold<sgw@linux.intel.com> >>> --- >>> meta-demoapps/recipes-gnome/abiword/abiword.inc | 4 ++-- >>> meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb | 10 ---------- >>> meta-demoapps/recipes-gnome/abiword/abiword_svn.bb | 10 ++++++++++ >>> 3 files changed, 12 insertions(+), 12 deletions(-) >>> delete mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb >>> create mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_svn.bb >>> >>> diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc >>> index b1b0f67..2b34a7a 100644 >>> --- a/meta-demoapps/recipes-gnome/abiword/abiword.inc >>> +++ b/meta-demoapps/recipes-gnome/abiword/abiword.inc >>> @@ -13,8 +13,8 @@ RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ >>> RELURI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" >>> RELSRC = "${WORKDIR}/abiword-${PV}/abi" >>> >>> -CVSURI = "cvs://anoncvs:anoncvs@anoncvs.abisource.com/cvsroot;module=abi" >>> -CVSSRC = "${WORKDIR}/abi" >>> +SVNURI = "cvs://svn.abisource.com/abiword/trunk;module=abiword;proto=http" >>> +SVNSRC = "${WORKDIR}/abi" >>> >> Er, its still using cvs:// ?! > > The whole abiword section is outdated, it has 2.5.2 which was released on 21-Aug-2007, latest is 2.8.6 released on 13-Jun-2010. I have an uncommited update in meta-oe to update abiword to 2.8.6, need to clean that up. > I will defer my patch for what Koen has pending then for meta-oe, probably the better place for it anyways, it should be removed from the meta-demoapps. Sau! > regards, > > Koen > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
Patch
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc index b1b0f67..2b34a7a 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword.inc +++ b/meta-demoapps/recipes-gnome/abiword/abiword.inc @@ -13,8 +13,8 @@ RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ RELURI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" RELSRC = "${WORKDIR}/abiword-${PV}/abi" -CVSURI = "cvs://anoncvs:anoncvs@anoncvs.abisource.com/cvsroot;module=abi" -CVSSRC = "${WORKDIR}/abi" +SVNURI = "cvs://svn.abisource.com/abiword/trunk;module=abiword;proto=http" +SVNSRC = "${WORKDIR}/abi" #want 2.x from 2.x.y for the installation directory SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb b/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb deleted file mode 100644 index 163029e..0000000 --- a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb +++ /dev/null @@ -1,10 +0,0 @@ -require abiword.inc - -SRCDATE = "20070130" -PV="2.5.0+cvs${SRCDATE}" -PR = "r4" - -SRC_URI = "${CVSURI}" - -S = "${CVSSRC}" - diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb b/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb new file mode 100644 index 0000000..a8946a8 --- /dev/null +++ b/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb @@ -0,0 +1,10 @@ +require abiword.inc + +SRCREV = "21818" +PV="2.5.2+svnr${SRCPV}" +PR = "r0" + +SRC_URI = "${SVNURI}" + +S = "${SVNSRC}" +
Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta-demoapps/recipes-gnome/abiword/abiword.inc | 4 ++-- meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb | 10 ---------- meta-demoapps/recipes-gnome/abiword/abiword_svn.bb | 10 ++++++++++ 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb create mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_svn.bb