[oe-commits] Aloisio Almeida Jr : mamona sdk: Re-arranging tasks, created task-mamona-sdk-noemu that conflicts and replaces task-mamona-sdk
GIT User account
git at amethyst.openembedded.net
Thu Oct 23 21:34:45 UTC 2008
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 5f5ceb32989d3531e3b0df4dd71e591d0a354d78
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5f5ceb32989d3531e3b0df4dd71e591d0a354d78
Author: Aloisio Almeida Jr <aloisio.almeida at openbosssa.org>
Date: Tue Aug 5 10:38:56 2008 -0300
mamona sdk: Re-arranging tasks, created task-mamona-sdk-noemu that conflicts and replaces task-mamona-sdk
---
packages/tasks/mamona-sdk.inc | 23 +++++++++++++++++++++++
packages/tasks/task-mamona-base.bb | 2 +-
packages/tasks/task-mamona-noemu.bb | 17 -----------------
packages/tasks/task-mamona-sdk-noemu.bb | 16 ++++++++++++++++
packages/tasks/task-mamona-sdk.bb | 30 ++++++++----------------------
5 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/packages/tasks/mamona-sdk.inc b/packages/tasks/mamona-sdk.inc
new file mode 100644
index 0000000..c7754ab
--- /dev/null
+++ b/packages/tasks/mamona-sdk.inc
@@ -0,0 +1,23 @@
+DESCRIPTION = "Mamona SDK - Packages for compilation and debug"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "${PN}"
+
+RDEPENDS = "\
+ task-mamona \
+ automake \
+ bison \
+ fakeroot \
+ flex \
+ gdb \
+ gettext \
+ groff \
+ libc6-dev \
+ libstdc++-dev \
+ make \
+ cvs \
+ subversion \
+ pkgconfig \
+ diffutils \
+"
diff --git a/packages/tasks/task-mamona-base.bb b/packages/tasks/task-mamona-base.bb
index 4fe243e..c3f867f 100644
--- a/packages/tasks/task-mamona-base.bb
+++ b/packages/tasks/task-mamona-base.bb
@@ -9,7 +9,7 @@ RDEPENDS = "\
apt \
base-files \
base-passwd \
- bash \
+ bash | bash-noemu \
busybox \
bzip2 \
coreutils \
diff --git a/packages/tasks/task-mamona-noemu.bb b/packages/tasks/task-mamona-noemu.bb
deleted file mode 100644
index 8eac3b2..0000000
--- a/packages/tasks/task-mamona-noemu.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Noemu packages are i386 packages thar run inside ARM chroot environment"
-LICENSE = "MIT"
-PR = "r1"
-ALLOW_EMPTY = "1"
-
-PACKAGES = "${PN}"
-RCONFLICTS = "task-mamona-sdk task-mamona-base task-mamona"
-
-RDEPENDS = "\
- bash-noemu \
- binutils-noemu \
- binutils-noemu-symlinks \
- gcc-noemu \
- gcc-noemu-symlinks \
- g++-noemu \
- g++-noemu-symlinks \
-"
diff --git a/packages/tasks/task-mamona-sdk-noemu.bb b/packages/tasks/task-mamona-sdk-noemu.bb
new file mode 100644
index 0000000..6572091
--- /dev/null
+++ b/packages/tasks/task-mamona-sdk-noemu.bb
@@ -0,0 +1,16 @@
+PR = "r0"
+
+require mamona-sdk.inc
+
+RCONFLICTS = "task-mamona-sdk"
+RREPLACES = "task-mamona-sdk"
+
+RDEPENDS += "\
+ bash-noemu \
+ binutils-noemu \
+ binutils-noemu-symlinks \
+ gcc-noemu \
+ gcc-noemu-symlinks \
+ g++-noemu \
+ g++-noemu-symlinks \
+"
diff --git a/packages/tasks/task-mamona-sdk.bb b/packages/tasks/task-mamona-sdk.bb
index a86268d..364ae1d 100644
--- a/packages/tasks/task-mamona-sdk.bb
+++ b/packages/tasks/task-mamona-sdk.bb
@@ -1,30 +1,16 @@
-DESCRIPTION = "Mamona SDK - Packages for compilation and debug"
-LICENSE = "MIT"
PR = "r2"
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
+include mamona-sdk.inc
-RDEPENDS = "\
- task-mamona \
- automake \
- bison \
- fakeroot \
- flex \
+RCONFLICTS = "task-mamona-sdk-noemu"
+RREPLACES = "task-mamona-sdk-noemu"
+
+RDEPENDS += "\
+ bash \
+ binutils \
+ binutils-symlinks \
gcc \
gcc-symlinks \
g++ \
g++-symlinks \
- gdb \
- gettext \
- groff \
- libc6-dev \
- libstdc++-dev \
- make \
- cvs \
- subversion \
- pkgconfig \
- binutils \
- diffutils \
- binutils-symlinks \
"
More information about the Openembedded-commits
mailing list