| Message ID | 1291813088-23444-1-git-send-email-obi@opendreambox.org |
|---|---|
| State | Rejected |
| Headers | show |
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index ec03276..30ec35b 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -50,11 +50,6 @@ FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" # Uncomment this to fetch packaged-staging packages from the central angstrom server #PSTAGE_MIRROR = "${ANGSTROM_URI}/${FEED_BASEPATH}packaged-staging" -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback -CVS_TARBALL_STASH ?= "\ - http://www.angstrom-distribution.org/unstable/sources/ \ - " - #Make sure we use 2.6 on machines with a 2.4/2.6 selector KERNEL = "kernel26" diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc index 36eca58..6e6bddb 100644 --- a/conf/distro/include/oplinux.inc +++ b/conf/distro/include/oplinux.inc @@ -28,10 +28,6 @@ MAINTAINER = "Digital OPSiS Developers Team <oplinux-developers@digital-opsis.co # Packaging and output format IMAGE_FSTYPES = "tar.gz jffs2 ext2.gz cramfs squashfs squashfs-lzma cpio.gz" -# Specifies a location to search for pre-generated tarballs when fetching -# a cvs:// URI. Outcomment this, if you always want to pull directly from CVS. -#CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/" - PREMIRRORS = "(ftp|http)://.*/.*/ http://source.digital-opsis.com/" # diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c2a380d..07dfd65 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -109,7 +109,6 @@ DISTRO_EXTRA_DEPENDS ?= "" DISTRO_EXTRA_RDEPENDS ?= "" DISTRO_EXTRA_RRECOMMENDS ?= "" -CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" INHERIT += "nslu2-mirrors" #FIXME: HACK: REMOVE THIS diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf index 815d40f..84ea4e7 100644 --- a/conf/distro/kaeilos.conf +++ b/conf/distro/kaeilos.conf @@ -48,12 +48,6 @@ EXTRA_IMAGECMD_ext2 = "-i 4096" FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback -CVS_TARBALL_STASH ?= "\ - http://www.angstrom-distribution.org/unstable/sources/ \ - " - - #Make sure we use 2.6 on machines with a 2.4/2.6 selector KERNEL = "kernel26" MACHINE_KERNEL_VERSION = "2.6" diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 0258231..bf615f8 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -79,8 +79,6 @@ ANGSTROM_BLACKLIST_pn-linux-ml403-mvista-2.6.x = "strange kernel, spank maintain ANGSTROM_BLACKLIST_pn-linux-davinci = "strange kernel, spank maintainer" -CVS_TARBALL_STASH += "http://build.shr-project.org/sources/" - #The shr-mirrors.bbclass repleaces this #PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/" INHERIT += "shr-mirrors"
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 And it isn't used in bitbake either? On 08-12-10 13:58, Andreas Oberritter wrote: > Signed-off-by: Andreas Oberritter <obi@opendreambox.org> > --- > conf/distro/angstrom-2008.1.conf | 5 ----- > conf/distro/include/oplinux.inc | 4 ---- > conf/distro/include/slugos.inc | 1 - > conf/distro/kaeilos.conf | 6 ------ > conf/distro/shr.conf | 2 -- > 5 files changed, 0 insertions(+), 18 deletions(-) > > diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf > index ec03276..30ec35b 100644 > --- a/conf/distro/angstrom-2008.1.conf > +++ b/conf/distro/angstrom-2008.1.conf > @@ -50,11 +50,6 @@ FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" > # Uncomment this to fetch packaged-staging packages from the central angstrom server > #PSTAGE_MIRROR = "${ANGSTROM_URI}/${FEED_BASEPATH}packaged-staging" > > -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback > -CVS_TARBALL_STASH ?= "\ > - http://www.angstrom-distribution.org/unstable/sources/ \ > - " > - > > #Make sure we use 2.6 on machines with a 2.4/2.6 selector > KERNEL = "kernel26" > diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc > index 36eca58..6e6bddb 100644 > --- a/conf/distro/include/oplinux.inc > +++ b/conf/distro/include/oplinux.inc > @@ -28,10 +28,6 @@ MAINTAINER = "Digital OPSiS Developers Team <oplinux-developers@digital-opsis.co > # Packaging and output format > IMAGE_FSTYPES = "tar.gz jffs2 ext2.gz cramfs squashfs squashfs-lzma cpio.gz" > > -# Specifies a location to search for pre-generated tarballs when fetching > -# a cvs:// URI. Outcomment this, if you always want to pull directly from CVS. > -#CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/" > - > PREMIRRORS = "(ftp|http)://.*/.*/ http://source.digital-opsis.com/" > > # > diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc > index c2a380d..07dfd65 100644 > --- a/conf/distro/include/slugos.inc > +++ b/conf/distro/include/slugos.inc > @@ -109,7 +109,6 @@ DISTRO_EXTRA_DEPENDS ?= "" > DISTRO_EXTRA_RDEPENDS ?= "" > DISTRO_EXTRA_RRECOMMENDS ?= "" > > -CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" > INHERIT += "nslu2-mirrors" > > #FIXME: HACK: REMOVE THIS > diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf > index 815d40f..84ea4e7 100644 > --- a/conf/distro/kaeilos.conf > +++ b/conf/distro/kaeilos.conf > @@ -48,12 +48,6 @@ EXTRA_IMAGECMD_ext2 = "-i 4096" > FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" > > > -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback > -CVS_TARBALL_STASH ?= "\ > - http://www.angstrom-distribution.org/unstable/sources/ \ > - " > - > - > #Make sure we use 2.6 on machines with a 2.4/2.6 selector > KERNEL = "kernel26" > MACHINE_KERNEL_VERSION = "2.6" > diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf > index 0258231..bf615f8 100644 > --- a/conf/distro/shr.conf > +++ b/conf/distro/shr.conf > @@ -79,8 +79,6 @@ ANGSTROM_BLACKLIST_pn-linux-ml403-mvista-2.6.x = "strange kernel, spank maintain > ANGSTROM_BLACKLIST_pn-linux-davinci = "strange kernel, spank maintainer" > > > -CVS_TARBALL_STASH += "http://build.shr-project.org/sources/" > - > #The shr-mirrors.bbclass repleaces this > #PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/" > INHERIT += "shr-mirrors" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) iD8DBQFM/9XwMkyGM64RGpERAindAJ9FJeNOloPLf/v2Jv9RKr7JW366ZwCdGimT bFe9TDngOxtkNwXsFz+zsaE= =wRqx -----END PGP SIGNATURE-----
On 12/08/2010 08:01 PM, Koen Kooi wrote: > And it isn't used in bitbake either? BitBake master and 1.10 don't use it. Now that you've asked, I checked older versions and saw that 1.8 still uses the variable. Reasons for creating the patches were a) BitBake ignoring my CVS_TARBALL_STASH variable and b) the existence of PREMIRRORS and MIRRORS, which provide more flexible functionality. What's your opinion to solve this inconsistency between BitBake versions? Regards, Andreas > On 08-12-10 13:58, Andreas Oberritter wrote: >> Signed-off-by: Andreas Oberritter <obi@opendreambox.org> >> --- >> conf/distro/angstrom-2008.1.conf | 5 ----- >> conf/distro/include/oplinux.inc | 4 ---- >> conf/distro/include/slugos.inc | 1 - >> conf/distro/kaeilos.conf | 6 ------ >> conf/distro/shr.conf | 2 -- >> 5 files changed, 0 insertions(+), 18 deletions(-) > >> diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf >> index ec03276..30ec35b 100644 >> --- a/conf/distro/angstrom-2008.1.conf >> +++ b/conf/distro/angstrom-2008.1.conf >> @@ -50,11 +50,6 @@ FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" >> # Uncomment this to fetch packaged-staging packages from the central angstrom server >> #PSTAGE_MIRROR = "${ANGSTROM_URI}/${FEED_BASEPATH}packaged-staging" > >> -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback >> -CVS_TARBALL_STASH ?= "\ >> - http://www.angstrom-distribution.org/unstable/sources/ \ >> - " >> - > >> #Make sure we use 2.6 on machines with a 2.4/2.6 selector >> KERNEL = "kernel26" >> diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc >> index 36eca58..6e6bddb 100644 >> --- a/conf/distro/include/oplinux.inc >> +++ b/conf/distro/include/oplinux.inc >> @@ -28,10 +28,6 @@ MAINTAINER = "Digital OPSiS Developers Team <oplinux-developers@digital-opsis.co >> # Packaging and output format >> IMAGE_FSTYPES = "tar.gz jffs2 ext2.gz cramfs squashfs squashfs-lzma cpio.gz" > >> -# Specifies a location to search for pre-generated tarballs when fetching >> -# a cvs:// URI. Outcomment this, if you always want to pull directly from CVS. >> -#CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/" >> - >> PREMIRRORS = "(ftp|http)://.*/.*/ http://source.digital-opsis.com/" > >> # >> diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc >> index c2a380d..07dfd65 100644 >> --- a/conf/distro/include/slugos.inc >> +++ b/conf/distro/include/slugos.inc >> @@ -109,7 +109,6 @@ DISTRO_EXTRA_DEPENDS ?= "" >> DISTRO_EXTRA_RDEPENDS ?= "" >> DISTRO_EXTRA_RRECOMMENDS ?= "" > >> -CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" >> INHERIT += "nslu2-mirrors" > >> #FIXME: HACK: REMOVE THIS >> diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf >> index 815d40f..84ea4e7 100644 >> --- a/conf/distro/kaeilos.conf >> +++ b/conf/distro/kaeilos.conf >> @@ -48,12 +48,6 @@ EXTRA_IMAGECMD_ext2 = "-i 4096" >> FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" > > >> -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback >> -CVS_TARBALL_STASH ?= "\ >> - http://www.angstrom-distribution.org/unstable/sources/ \ >> - " >> - >> - >> #Make sure we use 2.6 on machines with a 2.4/2.6 selector >> KERNEL = "kernel26" >> MACHINE_KERNEL_VERSION = "2.6" >> diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf >> index 0258231..bf615f8 100644 >> --- a/conf/distro/shr.conf >> +++ b/conf/distro/shr.conf >> @@ -79,8 +79,6 @@ ANGSTROM_BLACKLIST_pn-linux-ml403-mvista-2.6.x = "strange kernel, spank maintain >> ANGSTROM_BLACKLIST_pn-linux-davinci = "strange kernel, spank maintainer" > > >> -CVS_TARBALL_STASH += "http://build.shr-project.org/sources/" >> - >> #The shr-mirrors.bbclass repleaces this >> #PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/" >> INHERIT += "shr-mirrors" >
Ping. I think we should at least remove this variable from local.conf.sample and from the documentation, because bitbake >= 1.10 does not support it (patches 2 and 3). http://patches.openembedded.org/patch/15/ http://patches.openembedded.org/patch/17/ On 12/08/2010 08:35 PM, Andreas Oberritter wrote: > On 12/08/2010 08:01 PM, Koen Kooi wrote: >> And it isn't used in bitbake either? > > BitBake master and 1.10 don't use it. Now that you've asked, I checked > older versions and saw that 1.8 still uses the variable. > > Reasons for creating the patches were a) BitBake ignoring my > CVS_TARBALL_STASH variable and b) the existence of PREMIRRORS and > MIRRORS, which provide more flexible functionality. > > What's your opinion to solve this inconsistency between BitBake versions? > > Regards, > Andreas > >> On 08-12-10 13:58, Andreas Oberritter wrote: >>> Signed-off-by: Andreas Oberritter <obi@opendreambox.org> >>> --- >>> conf/distro/angstrom-2008.1.conf | 5 ----- >>> conf/distro/include/oplinux.inc | 4 ---- >>> conf/distro/include/slugos.inc | 1 - >>> conf/distro/kaeilos.conf | 6 ------ >>> conf/distro/shr.conf | 2 -- >>> 5 files changed, 0 insertions(+), 18 deletions(-) >> >>> diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf >>> index ec03276..30ec35b 100644 >>> --- a/conf/distro/angstrom-2008.1.conf >>> +++ b/conf/distro/angstrom-2008.1.conf >>> @@ -50,11 +50,6 @@ FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" >>> # Uncomment this to fetch packaged-staging packages from the central angstrom server >>> #PSTAGE_MIRROR = "${ANGSTROM_URI}/${FEED_BASEPATH}packaged-staging" >> >>> -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback >>> -CVS_TARBALL_STASH ?= "\ >>> - http://www.angstrom-distribution.org/unstable/sources/ \ >>> - " >>> - >> >>> #Make sure we use 2.6 on machines with a 2.4/2.6 selector >>> KERNEL = "kernel26" >>> diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc >>> index 36eca58..6e6bddb 100644 >>> --- a/conf/distro/include/oplinux.inc >>> +++ b/conf/distro/include/oplinux.inc >>> @@ -28,10 +28,6 @@ MAINTAINER = "Digital OPSiS Developers Team <oplinux-developers@digital-opsis.co >>> # Packaging and output format >>> IMAGE_FSTYPES = "tar.gz jffs2 ext2.gz cramfs squashfs squashfs-lzma cpio.gz" >> >>> -# Specifies a location to search for pre-generated tarballs when fetching >>> -# a cvs:// URI. Outcomment this, if you always want to pull directly from CVS. >>> -#CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/" >>> - >>> PREMIRRORS = "(ftp|http)://.*/.*/ http://source.digital-opsis.com/" >> >>> # >>> diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc >>> index c2a380d..07dfd65 100644 >>> --- a/conf/distro/include/slugos.inc >>> +++ b/conf/distro/include/slugos.inc >>> @@ -109,7 +109,6 @@ DISTRO_EXTRA_DEPENDS ?= "" >>> DISTRO_EXTRA_RDEPENDS ?= "" >>> DISTRO_EXTRA_RRECOMMENDS ?= "" >> >>> -CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" >>> INHERIT += "nslu2-mirrors" >> >>> #FIXME: HACK: REMOVE THIS >>> diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf >>> index 815d40f..84ea4e7 100644 >>> --- a/conf/distro/kaeilos.conf >>> +++ b/conf/distro/kaeilos.conf >>> @@ -48,12 +48,6 @@ EXTRA_IMAGECMD_ext2 = "-i 4096" >>> FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" >> >> >>> -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback >>> -CVS_TARBALL_STASH ?= "\ >>> - http://www.angstrom-distribution.org/unstable/sources/ \ >>> - " >>> - >>> - >>> #Make sure we use 2.6 on machines with a 2.4/2.6 selector >>> KERNEL = "kernel26" >>> MACHINE_KERNEL_VERSION = "2.6" >>> diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf >>> index 0258231..bf615f8 100644 >>> --- a/conf/distro/shr.conf >>> +++ b/conf/distro/shr.conf >>> @@ -79,8 +79,6 @@ ANGSTROM_BLACKLIST_pn-linux-ml403-mvista-2.6.x = "strange kernel, spank maintain >>> ANGSTROM_BLACKLIST_pn-linux-davinci = "strange kernel, spank maintainer" >> >> >>> -CVS_TARBALL_STASH += "http://build.shr-project.org/sources/" >>> - >>> #The shr-mirrors.bbclass repleaces this >>> #PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/" >>> INHERIT += "shr-mirrors" >> > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
On (13/12/10 13:42), Andreas Oberritter wrote: > Ping. > > I think we should at least remove this variable from local.conf.sample > and from the documentation, because bitbake >= 1.10 does not support it > (patches 2 and 3). > > http://patches.openembedded.org/patch/15/ > http://patches.openembedded.org/patch/17/ yes. Applied thx
Signed-off-by: Andreas Oberritter <obi@opendreambox.org> --- conf/distro/angstrom-2008.1.conf | 5 ----- conf/distro/include/oplinux.inc | 4 ---- conf/distro/include/slugos.inc | 1 - conf/distro/kaeilos.conf | 6 ------ conf/distro/shr.conf | 2 -- 5 files changed, 0 insertions(+), 18 deletions(-)