summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/packages/meta/meta-toolchain.bb20
-rw-r--r--meta/packages/tasks/task-poky-standalone-sdk-host.bb20
-rw-r--r--meta/packages/tasks/task-poky-standalone-sdk-target.bb (renamed from meta/packages/tasks/task-sdk.bb)14
3 files changed, 28 insertions, 26 deletions
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 391adc411..652eb2537 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -17,21 +17,9 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
IPKG_HOST = "ipkg-cl -f ${SDK_DIR}/ipkg-host.conf -o ${SDK_OUTPUT}"
IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
-HOST_INSTALL = "\
- binutils-cross-sdk \
- gcc-cross-sdk \
- g++ \
- cpp \
- libgcc \
- libgcc-dev \
- libstdc++ \
- libstdc++-dev \
- gdb-cross \
- "
-
-TARGET_INSTALL = "\
- task-sdk-bare \
- "
+HOST_INSTALL = "task-poky-standalone-sdk-host"
+
+TARGET_INSTALL = "task-poky-standalone-sdk-target"
RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
@@ -60,7 +48,7 @@ EOF
mkdir -p ${SDK_OUTPUT}
${IPKG_HOST} update
- ${IPKG_HOST} -nodeps install ${HOST_INSTALL}
+ ${IPKG_HOST} -force-depends install ${HOST_INSTALL}
${IPKG_TARGET} update
${IPKG_TARGET} install ${TARGET_INSTALL}
diff --git a/meta/packages/tasks/task-poky-standalone-sdk-host.bb b/meta/packages/tasks/task-poky-standalone-sdk-host.bb
new file mode 100644
index 000000000..2140e9662
--- /dev/null
+++ b/meta/packages/tasks/task-poky-standalone-sdk-host.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Host packages for the standalone SDK (external toolchain)"
+PR = "r0"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+inherit sdk
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} = "\
+ binutils-cross-sdk \
+ gcc-cross-sdk \
+ g++ \
+ cpp \
+ libgcc \
+ libgcc-dev \
+ libstdc++ \
+ libstdc++-dev \
+ gdb-cross \
+ " \ No newline at end of file
diff --git a/meta/packages/tasks/task-sdk.bb b/meta/packages/tasks/task-poky-standalone-sdk-target.bb
index 1f3c4a741..6945715c4 100644
--- a/meta/packages/tasks/task-sdk.bb
+++ b/meta/packages/tasks/task-poky-standalone-sdk-target.bb
@@ -1,13 +1,11 @@
-DESCRIPTION = "SDK packages"
-PR = "r16"
+DESCRIPTION = "Target packages for the standalone SDK (external toolchain)"
+PR = "r0"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
-PACKAGES = "\
- task-sdk-bare \
- "
+PACKAGES = "${PN}"
-RDEPENDS_task-sdk-bare = "\
+RDEPENDS_${PN} = "\
glibc \
glibc-dev \
glibc-utils \
@@ -22,7 +20,3 @@ RDEPENDS_task-sdk-bare = "\
libgcc \
libstdc++ \
"
-
-RRECOMMENDS_task-sdk-bare = "\
- glibc-binary-localedata-en-gb \
- " \ No newline at end of file