[BUG 4797] task-sdk.bb and task-sdk-bare.bb duplicate some functionality

[BUG 4797] task-sdk.bb and task-sdk-bare.bb duplicate some functionality

[Tom Rini]

[ Both patches are also attached to bug 4797 ]

Currently, we have task-sdk.bb, which provides task-sdk-bare, and will
bring in just abstracted ${LIBC}, $[LIBC}-dev and libgcc-dev.  We also
have task-sdk-bare.bb which brings in a number of glibc packages, libgcc
and libstdc++/libstdc++-dev and as far as I can tell is the only
task-sdk-bare actually used.  The attached patch consolidates both so
that task-sdk-bare.bb will be useful on both glibc and uclibc.

Signed-off-by: Tom Rini <trini@embeddedalley.com>

task-sdk-bare: Update and abstract to support uclibc
task-sdk.bb provided a task-sdk-bare version that supported uclibc, but
this wasn't used anymore.  Update task-sdk-bare.bb to have glibc / uclibc
abstractions and delete the unused file.

diff --git a/packages/tasks/task-sdk-bare.bb b/packages/tasks/task-sdk-bare.bb
index d2d40f6..ea0ab31 100644
--- a/packages/tasks/task-sdk-bare.bb
+++ b/packages/tasks/task-sdk-bare.bb
@@ -5,7 +5,7 @@ ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
 
-RDEPENDS_${PN} = "\
+GLIBC_PKGS = "\
     glibc \
     glibc-dbg \
     glibc-dev \
@@ -18,6 +18,16 @@ RDEPENDS_${PN} = "\
     glibc-gconv-iso8859-1 \
     glibc-gconv-iso8859-15 \
     locale-base-en-gb \
+    "
+
+LIBC_PKGS_linux = "${GLIBC_PKGS}"
+LIBC_PKGS_linux-gnueabi = "${GLIBC_PKGS}"
+LIBC_PKGS_linux-uclibc = "uclibc uclibc-dev"
+LIBC_PKGS_linux-uclibcgnueabi = "uclibc uclibc-dev"
+
+RDEPENDS_${PN} = "\
+    ${LIBC_PKGS} \
     libgcc \
     libstdc++ \
+    libstdc++-dev \
 "
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
deleted file mode 100644
index 79e9fef..0000000
--- a/packages/tasks/task-sdk.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "SDK packages"
-PR = "r8"
-LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-
-PACKAGES = "\
-    task-sdk-bare \
-    "
-
-DEPENDS = "virtual/libc"
-
-LIBC_linux = "glibc"
-LIBC_linux-uclibc = "uclibc"
-LIBC_linux-gnueabi = "glibc"
-LIBC_linux-uclibcgnueabi = "uclibc"
-
-
-RDEPENDS_task-sdk-bare = "\
-    ${LIBC} \
-    ${LIBC}-dev \
-    libgcc \
-    "
-- 
1.5.2.5

As an addition to the previous patch, add uclibc-thread-db to the list
of uclibc packages to install, based on glibc bringing in
glibc-thread-db.
diff --git a/packages/tasks/task-sdk-bare.bb b/packages/tasks/task-sdk-bare.bb
index ea0ab31..ab338e6 100644
--- a/packages/tasks/task-sdk-bare.bb
+++ b/packages/tasks/task-sdk-bare.bb
@@ -22,8 +22,8 @@ GLIBC_PKGS = "\
 
 LIBC_PKGS_linux = "${GLIBC_PKGS}"
 LIBC_PKGS_linux-gnueabi = "${GLIBC_PKGS}"
-LIBC_PKGS_linux-uclibc = "uclibc uclibc-dev"
-LIBC_PKGS_linux-uclibcgnueabi = "uclibc uclibc-dev"
+LIBC_PKGS_linux-uclibc = "uclibc uclibc-dev uclibc-thread-db"
+LIBC_PKGS_linux-uclibcgnueabi = "uclibc uclibc-dev uclibc-thread-db"
 
 RDEPENDS_${PN} = "\
     ${LIBC_PKGS} \

-- 
Tom Rini

Re: [BUG 4797] task-sdk.bb and task-sdk-bare.bb duplicate some functionality

[Tom Rini]

On Mon, Nov 17, 2008 at 11:59:42AM -0700, Tom Rini wrote:

> [ Both patches are also attached to bug 4797 ]
> 
> Currently, we have task-sdk.bb, which provides task-sdk-bare, and will
> bring in just abstracted ${LIBC}, $[LIBC}-dev and libgcc-dev.  We also
> have task-sdk-bare.bb which brings in a number of glibc packages, libgcc
> and libstdc++/libstdc++-dev and as far as I can tell is the only
> task-sdk-bare actually used.  The attached patch consolidates both so
> that task-sdk-bare.bb will be useful on both glibc and uclibc.
> 
> Signed-off-by: Tom Rini <trini@embeddedalley.com>

Anyone?

> task-sdk-bare: Update and abstract to support uclibc
> task-sdk.bb provided a task-sdk-bare version that supported uclibc, but
> this wasn't used anymore.  Update task-sdk-bare.bb to have glibc / uclibc
> abstractions and delete the unused file.
> 
> diff --git a/packages/tasks/task-sdk-bare.bb b/packages/tasks/task-sdk-bare.bb
> index d2d40f6..ea0ab31 100644
> --- a/packages/tasks/task-sdk-bare.bb
> +++ b/packages/tasks/task-sdk-bare.bb
> @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1"
>  
>  PACKAGES = "${PN}"
>  
> -RDEPENDS_${PN} = "\
> +GLIBC_PKGS = "\
>      glibc \
>      glibc-dbg \
>      glibc-dev \
> @@ -18,6 +18,16 @@ RDEPENDS_${PN} = "\
>      glibc-gconv-iso8859-1 \
>      glibc-gconv-iso8859-15 \
>      locale-base-en-gb \
> +    "
> +
> +LIBC_PKGS_linux = "${GLIBC_PKGS}"
> +LIBC_PKGS_linux-gnueabi = "${GLIBC_PKGS}"
> +LIBC_PKGS_linux-uclibc = "uclibc uclibc-dev"
> +LIBC_PKGS_linux-uclibcgnueabi = "uclibc uclibc-dev"
> +
> +RDEPENDS_${PN} = "\
> +    ${LIBC_PKGS} \
>      libgcc \
>      libstdc++ \
> +    libstdc++-dev \
>  "
> diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
> deleted file mode 100644
> index 79e9fef..0000000
> --- a/packages/tasks/task-sdk.bb
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -DESCRIPTION = "SDK packages"
> -PR = "r8"
> -LICENSE = "MIT"
> -ALLOW_EMPTY = "1"
> -
> -PACKAGES = "\
> -    task-sdk-bare \
> -    "
> -
> -DEPENDS = "virtual/libc"
> -
> -LIBC_linux = "glibc"
> -LIBC_linux-uclibc = "uclibc"
> -LIBC_linux-gnueabi = "glibc"
> -LIBC_linux-uclibcgnueabi = "uclibc"
> -
> -
> -RDEPENDS_task-sdk-bare = "\
> -    ${LIBC} \
> -    ${LIBC}-dev \
> -    libgcc \
> -    "
> -- 
> 1.5.2.5
> 
> As an addition to the previous patch, add uclibc-thread-db to the list
> of uclibc packages to install, based on glibc bringing in
> glibc-thread-db.
> diff --git a/packages/tasks/task-sdk-bare.bb b/packages/tasks/task-sdk-bare.bb
> index ea0ab31..ab338e6 100644
> --- a/packages/tasks/task-sdk-bare.bb
> +++ b/packages/tasks/task-sdk-bare.bb
> @@ -22,8 +22,8 @@ GLIBC_PKGS = "\
>  
>  LIBC_PKGS_linux = "${GLIBC_PKGS}"
>  LIBC_PKGS_linux-gnueabi = "${GLIBC_PKGS}"
> -LIBC_PKGS_linux-uclibc = "uclibc uclibc-dev"
> -LIBC_PKGS_linux-uclibcgnueabi = "uclibc uclibc-dev"
> +LIBC_PKGS_linux-uclibc = "uclibc uclibc-dev uclibc-thread-db"
> +LIBC_PKGS_linux-uclibcgnueabi = "uclibc uclibc-dev uclibc-thread-db"
>  
>  RDEPENDS_${PN} = "\
>      ${LIBC_PKGS} \
> 
> -- 
> Tom Rini
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Tom Rini

Re: [BUG 4797] task-sdk.bb and task-sdk-bare.bb duplicate some functionality

[Henning Heinold]

On Mon, Nov 24, 2008 at 09:39:38AM -0700, Tom Rini wrote:
> On Mon, Nov 17, 2008 at 11:59:42AM -0700, Tom Rini wrote:
> 
> > [ Both patches are also attached to bug 4797 ]
> > 
> > Currently, we have task-sdk.bb, which provides task-sdk-bare, and will
> > bring in just abstracted ${LIBC}, $[LIBC}-dev and libgcc-dev.  We also
> > have task-sdk-bare.bb which brings in a number of glibc packages, libgcc
> > and libstdc++/libstdc++-dev and as far as I can tell is the only
> > task-sdk-bare actually used.  The attached patch consolidates both so
> > that task-sdk-bare.bb will be useful on both glibc and uclibc.
> > 
> > Signed-off-by: Tom Rini <trini@embeddedalley.com>
> 
> Anyone?
> 
> > task-sdk-bare: Update and abstract to support uclibc
> > task-sdk.bb provided a task-sdk-bare version that supported uclibc, but
> > this wasn't used anymore.  Update task-sdk-bare.bb to have glibc / uclibc
> > abstractions and delete the unused file.
> > 
> > diff --git a/packages/tasks/task-sdk-bare.bb b/packages/tasks/task-sdk-bare.bb
> > index d2d40f6..ea0ab31 100644
> > --- a/packages/tasks/task-sdk-bare.bb
> > +++ b/packages/tasks/task-sdk-bare.bb
> > @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1"
> >  
> >  PACKAGES = "${PN}"
> >  
> > -RDEPENDS_${PN} = "\
> > +GLIBC_PKGS = "\
> >      glibc \
> >      glibc-dbg \
> >      glibc-dev \
> > @@ -18,6 +18,16 @@ RDEPENDS_${PN} = "\
> >      glibc-gconv-iso8859-1 \
> >      glibc-gconv-iso8859-15 \
> >      locale-base-en-gb \
> > +    "
> > +
> > +LIBC_PKGS_linux = "${GLIBC_PKGS}"
> > +LIBC_PKGS_linux-gnueabi = "${GLIBC_PKGS}"
> > +LIBC_PKGS_linux-uclibc = "uclibc uclibc-dev"
> > +LIBC_PKGS_linux-uclibcgnueabi = "uclibc uclibc-dev"
> > +
> > +RDEPENDS_${PN} = "\
> > +    ${LIBC_PKGS} \
> >      libgcc \
> >      libstdc++ \
> > +    libstdc++-dev \
> >  "
> > diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
> > deleted file mode 100644
> > index 79e9fef..0000000
> > --- a/packages/tasks/task-sdk.bb
> > +++ /dev/null
> > @@ -1,22 +0,0 @@
> > -DESCRIPTION = "SDK packages"
> > -PR = "r8"
> > -LICENSE = "MIT"
> > -ALLOW_EMPTY = "1"
> > -
> > -PACKAGES = "\
> > -    task-sdk-bare \
> > -    "
> > -
> > -DEPENDS = "virtual/libc"
> > -
> > -LIBC_linux = "glibc"
> > -LIBC_linux-uclibc = "uclibc"
> > -LIBC_linux-gnueabi = "glibc"
> > -LIBC_linux-uclibcgnueabi = "uclibc"
> > -
> > -
> > -RDEPENDS_task-sdk-bare = "\
> > -    ${LIBC} \
> > -    ${LIBC}-dev \
> > -    libgcc \
> > -    "
> > -- 
> > 1.5.2.5
> > 
> > As an addition to the previous patch, add uclibc-thread-db to the list
> > of uclibc packages to install, based on glibc bringing in
> > glibc-thread-db.
> > diff --git a/packages/tasks/task-sdk-bare.bb b/packages/tasks/task-sdk-bare.bb
> > index ea0ab31..ab338e6 100644
> > --- a/packages/tasks/task-sdk-bare.bb
> > +++ b/packages/tasks/task-sdk-bare.bb
> > @@ -22,8 +22,8 @@ GLIBC_PKGS = "\
> >  
> >  LIBC_PKGS_linux = "${GLIBC_PKGS}"
> >  LIBC_PKGS_linux-gnueabi = "${GLIBC_PKGS}"
> > -LIBC_PKGS_linux-uclibc = "uclibc uclibc-dev"
> > -LIBC_PKGS_linux-uclibcgnueabi = "uclibc uclibc-dev"
> > +LIBC_PKGS_linux-uclibc = "uclibc uclibc-dev uclibc-thread-db"
> > +LIBC_PKGS_linux-uclibcgnueabi = "uclibc uclibc-dev uclibc-thread-db"
> >  
> >  RDEPENDS_${PN} = "\
> >      ${LIBC_PKGS} \
> > 
> > -- 
> > Tom Rini
> > 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
> -- 
> Tom Rini

Hm,

is this a core change or not? If yes +1 from and by the way if Tom Rini
wants it, I suggest he gets git rw status, because he submitted a lot
of good patches.

Bye Henning

Re: [BUG 4797] task-sdk.bb and task-sdk-bare.bb duplicate some functionality

[Tom Rini]

On Mon, Nov 24, 2008 at 11:24:13PM +0100, Henning Heinold wrote:
[snip]
> Hm,
> 
> is this a core change or not? If yes +1 from and by the way if Tom Rini
> wants it, I suggest he gets git rw status, because he submitted a lot
> of good patches.

If that means I can get some of my still outstand changes in bugzilla
in, sure :)

-- 
Tom Rini

Commit access for Tim Rini (Was: Re: [BUG 4797] task-sdk.bb and task-sdk-bare.bb duplicate some functionality )

[Holger Freyther]

On Monday 24 November 2008 23:24:13 Henning Heinold wrote:
> On Mon, Nov 24, 2008 at 09:39:38AM -0700, Tom Rini wrote:

> > Tom Rini
>
> Hm,
>
> is this a core change or not? If yes +1 from and by the way if Tom Rini
> wants it, I suggest he gets git rw status, because he submitted a lot
> of good patches.

I second that.

z.

Re: Commit access for Tim Rini (Was: Re: [BUG 4797] task-sdk.bb and task-sdk-bare.bb duplicate some functionality )

[Michael 'Mickey' Lauer]

+1

Tom,

send me your ssh key.

-- 
:M: