[oe-commits] org.oe.dev merge of '2c34202b0dfd11794a79da2cd891a88adbfcea48'
rpurdie commit
openembedded-commits at lists.openembedded.org
Thu Feb 28 18:25:20 UTC 2008
merge of '2c34202b0dfd11794a79da2cd891a88adbfcea48'
and 'fd02aa1602a7d21248a66f67a25e6435c8443a48'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 63238ec5d594052d5284fab3a6fc891dff49f06e
ViewMTN: http://monotone.openembedded.org/revision/info/63238ec5d594052d5284fab3a6fc891dff49f06e
Files:
1
packages/python/python-gst_0.10.10.bb
packages/radlib/x
packages/uqm/uqm-0.5.0
packages/uqm/uqm-0.5.0/build-oe.patch
classes/package.bbclass
classes/package_ipk.bbclass
classes/qt3e.bbclass
classes/qt3x11.bbclass
packages/glibc/eglibc-initial_svn.bb
packages/glibc/eglibc_svn.bb
packages/libpixman/libpixman_0.1.5.bb
packages/libpixman/libpixman_0.1.6.bb
packages/libpixman/libpixman_cvs.bb
packages/meta/meta-toolchain.bb
packages/nonworking/docbook/docbook_4.2.bb
packages/nonworking/lufs/lufs_0.9.7.bb
packages/nonworking/pixdev/pixdev-stable_0.1.bb
packages/nonworking/python/python-gsl_0.2.0.bb
packages/nonworking/xfree86/xfree86_4.3.0.bb
packages/qt/qt-x11-free-common.inc
packages/qt/qt-x11-free-native_3.3.5.bb
packages/qt4/qt4-x11-free_4.1.2.bb
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt-static_2.3.10.bb
packages/qte/qte-mt-static_2.3.12.bb
packages/startup-notification/startup-notification_0.5.bb
packages/tremor/tremor_svn.bb
packages/uclibc/uclibc.inc
packages/uqm/uqm_0.3.bb
packages/uqm/uqm_0.5.0.bb
Diffs:
#
# mt diff -r2c34202b0dfd11794a79da2cd891a88adbfcea48 -r63238ec5d594052d5284fab3a6fc891dff49f06e
#
#
#
# patch "packages/python/python-gst_0.10.10.bb"
# from [d5aab69018139eb74a0a3d2b4a439c3a8196e9cd]
# to [567b17a1de7384771221d1f7b1e49482a299d604]
#
============================================================
--- packages/python/python-gst_0.10.10.bb d5aab69018139eb74a0a3d2b4a439c3a8196e9cd
+++ packages/python/python-gst_0.10.10.bb 567b17a1de7384771221d1f7b1e49482a299d604
@@ -1,8 +1,8 @@ DEPENDS = "gstreamer gst-plugins-base py
DESCRIPTION = "Python Gstreamer bindings"
SECTION = "devel/python"
LICENSE = "LGPL"
DEPENDS = "gstreamer gst-plugins-base python-pygobject"
-PR = "ml0"
+PR = "ml1"
SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
file://python-path.patch;patch=1"
@@ -21,6 +21,12 @@ do_stage() {
autotools_stage_all
}
+PACKAGES =+ "${PN}-examples"
+
FILES_${PN} += "${datadir}/gst-python"
-FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
+FILES_${PN}-dev += "\
+ ${datadir}/gst-python/0.10/defs \
+ ${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/*.la \
+"
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
+FILES_${PN}-examples = "${datadir}/gst-python/0.10/examples"
#
# mt diff -rfd02aa1602a7d21248a66f67a25e6435c8443a48 -r63238ec5d594052d5284fab3a6fc891dff49f06e
#
#
#
# delete "packages/radlib/x"
#
# add_dir "packages/uqm/uqm-0.5.0"
#
# add_file "packages/uqm/uqm-0.5.0/build-oe.patch"
# content [82d8e418676eae552e4a23d6ea6814cdacf8a23c]
#
# patch "classes/package.bbclass"
# from [770c055d09c5280cd9c6ca2b7c1280e7540b3356]
# to [cd20e29d5ac82c1f004df7096eb69486fad995b7]
#
# patch "classes/package_ipk.bbclass"
# from [fdf9fdf2855198b24b017026dd3777995b2977d2]
# to [5034d6b967ea7da5ccaf3b815655ea7f85cd3ca0]
#
# patch "classes/qt3e.bbclass"
# from [13fd2f64835873afe33fd96ebb2d538da23fbd4f]
# to [811e365ef0d4b3e9f85313437c89d53a8e7c8773]
#
# patch "classes/qt3x11.bbclass"
# from [021061b87cd1c52fec22479c0efe7312a0d41898]
# to [532e247f5a25ce05797b079449fe17bcbe679471]
#
# patch "packages/glibc/eglibc-initial_svn.bb"
# from [46bafc76fbe8160a3e1317fac15ef3e15e3565bb]
# to [0547991d73a5b6ba8b352b27825176d869221e0e]
#
# patch "packages/glibc/eglibc_svn.bb"
# from [e0e53388d3e2f7fb82da6c0800429fb089aaa667]
# to [2cf6a0fbb0bf1ac56fc2f096f68a8e53c4510678]
#
# patch "packages/libpixman/libpixman_0.1.5.bb"
# from [3d21fed4e312a1e2025db7f890be18ddb6ccf26e]
# to [7a1449b0ff23d0d12d9e4a85b9ce949c5df1b251]
#
# patch "packages/libpixman/libpixman_0.1.6.bb"
# from [3d21fed4e312a1e2025db7f890be18ddb6ccf26e]
# to [7a1449b0ff23d0d12d9e4a85b9ce949c5df1b251]
#
# patch "packages/libpixman/libpixman_cvs.bb"
# from [08ff04c7c56cbb9086efff5dd14a754a431d5afe]
# to [a5823453577e2f977381d5054fb188fb050554cf]
#
# patch "packages/meta/meta-toolchain.bb"
# from [d53849cfd4dc2f21fcd44b4cc0926382313fc1e9]
# to [95ccbc599aa34310c2d939504ab869df02206d32]
#
# patch "packages/nonworking/docbook/docbook_4.2.bb"
# from [25d8885da2da6f96d18647fbbb1c478aa541d6ec]
# to [09526fe32fac15a4d24d822262d01fbffc73ff72]
#
# patch "packages/nonworking/lufs/lufs_0.9.7.bb"
# from [6f5ee34c6442ab2e18a8889a706ba43158d7dcae]
# to [67b02154f92c0d03776c3f5e52d4b57e6be28111]
#
# patch "packages/nonworking/pixdev/pixdev-stable_0.1.bb"
# from [96db2d0de37847ebafb87aa6fdef43968e60520a]
# to [40c095b4cbeaf28c97908e780bcbf81d4550ee7e]
#
# patch "packages/nonworking/python/python-gsl_0.2.0.bb"
# from [fb8b06179d805122174063255ffbfc640aab3199]
# to [c5eb46d6e074780c12aca8b5c3b774b2c4c78d57]
#
# patch "packages/nonworking/xfree86/xfree86_4.3.0.bb"
# from [aa28d0921f73395ac4b0b7efa141a5b4fd2b546f]
# to [6f2e341c39d8eb59cf42474fe772bb6ede0308bb]
#
# patch "packages/qt/qt-x11-free-common.inc"
# from [6dcb32e86f0ad84e9cccbc5e9c36107259b8a388]
# to [d07ee8f7619a8af14a1e90c1820feaffd407969a]
#
# patch "packages/qt/qt-x11-free-native_3.3.5.bb"
# from [59251d06fe96fd830e70b5d3f020c7ae2c0aec22]
# to [8f8828676843b9ef004c141ea764624a17f4e4de]
#
# patch "packages/qt4/qt4-x11-free_4.1.2.bb"
# from [3f0c2bbb385a352c8af18085b894d4224822db3c]
# to [40cb1e9a0fecc27be589b5bce0159daa9b1b3559]
#
# patch "packages/qte/qte-common_2.3.10.inc"
# from [954d5e2c5dc204e10fdd77b8badc87ea4892ccb0]
# to [0aac8dfbf78ecb980a8817d0ceef6220a54f4724]
#
# patch "packages/qte/qte-mt-static_2.3.10.bb"
# from [0e4fb9a326b0c9f986910827e9c39d1d1cddf0b5]
# to [31328536466adee57ee327c6775b190348b68f04]
#
# patch "packages/qte/qte-mt-static_2.3.12.bb"
# from [ad00c3d93621b32217e70b5334b51eb19c1d2f57]
# to [2f1b26102de47e5a71dd254377cbd267ffa58456]
#
# patch "packages/startup-notification/startup-notification_0.5.bb"
# from [71d94468f2ddf5ddeb47b3f92e939db7f8c83412]
# to [6a3cd8d5a62293c2ad7b34db9ba05b0cba4f7229]
#
# patch "packages/tremor/tremor_svn.bb"
# from [0c254c3bbb0a1232b0fa23c1c04deadea24473f0]
# to [d149d825d643fad4a2760291a1d348e8feb401cb]
#
# patch "packages/uclibc/uclibc.inc"
# from [c9c79ae76287d39c4c0f25cd721cd57d7f5305bb]
# to [de423804aa3669733b033b1a6d9f50c7e3d07d41]
#
# patch "packages/uqm/uqm_0.3.bb"
# from [390eb5201ea556005a015d7c87f818c9699ad432]
# to [e738c13e85e08e12edb4e687a8d6b4e5c849f72b]
#
# patch "packages/uqm/uqm_0.5.0.bb"
# from [e33f178097579a1b72de5116c1da9676c88956a2]
# to [f553e0c8857bd55564956afefb36e8f0b971c6a6]
#
============================================================
--- packages/uqm/uqm-0.5.0/build-oe.patch 82d8e418676eae552e4a23d6ea6814cdacf8a23c
+++ packages/uqm/uqm-0.5.0/build-oe.patch 82d8e418676eae552e4a23d6ea6814cdacf8a23c
@@ -0,0 +1,40 @@
+Index: build/unix/config_proginfo_build
+===================================================================
+--- build/unix/config_proginfo_build.orig 2008-02-28 10:00:47.000000000 +0000
++++ build/unix/config_proginfo_build 2008-02-28 10:01:38.000000000 +0000
+@@ -37,9 +37,9 @@
+
+ ### gcc ###
+ PROG_gcc_NAME="GNU C compiler"
+-PROG_gcc_FILE="gcc"
++PROG_gcc_FILE="$CC"
+ PROG_gcc_ACTION=""
+-PROG_gcc_VERSION='$(gcc --version)'
++PROG_gcc_VERSION='$($CC --version)'
+
+
+ ### sed ###
+Index: build/unix/config_proginfo_host
+===================================================================
+--- build/unix/config_proginfo_host.orig 2008-02-28 10:00:47.000000000 +0000
++++ build/unix/config_proginfo_host 2008-02-28 10:03:09.000000000 +0000
+@@ -69,7 +69,7 @@
+ ;;
+ *)
+ LIB_SDL_CFLAGS='$(sdl-config --cflags)'
+- LIB_SDL_LDFLAGS='$(sdl-config --libs)'
++ LIB_SDL_LDFLAGS='$(sdl-config --libs) -lts -lpng -ljpeg -lz'
+ LIB_SDL_VERSION='$(sdl-config --version)'
+ ;;
+ esac
+@@ -170,8 +170,8 @@
+ LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis -logg -lm"
+ ;;
+ *)
+- LIB_vorbisfile_CFLAGS=""
+- LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis"
++ LIB_vorbisfile_CFLAGS="-I$STAGING_INCDIR"
++ LIB_vorbisfile_LDFLAGS="-L$STAGING_LIBDIR -lvorbisfile -lvorbis -logg"
+ ;;
+ esac
+ LIB_vorbisfile_VERSION=""
============================================================
--- classes/package.bbclass 770c055d09c5280cd9c6ca2b7c1280e7540b3356
+++ classes/package.bbclass cd20e29d5ac82c1f004df7096eb69486fad995b7
@@ -519,7 +519,7 @@ fi
fi
}
-SHLIBSDIR = "${STAGING_DIR}/${HOST_SYS}/shlibs"
+SHLIBSDIR = "${STAGING_DIR_HOST}/shlibs"
python package_do_shlibs() {
import os, re, os.path
============================================================
--- classes/package_ipk.bbclass fdf9fdf2855198b24b017026dd3777995b2977d2
+++ classes/package_ipk.bbclass 5034d6b967ea7da5ccaf3b815655ea7f85cd3ca0
@@ -12,6 +12,10 @@ python package_ipk_install () {
}
python package_ipk_install () {
+ #
+ # Warning - this function is not multimachine safe (see stagingdir reference)!
+ #
+
import os, sys
pkg = bb.data.getVar('PKG', d, 1)
pkgfn = bb.data.getVar('PKGFN', d, 1)
============================================================
--- classes/qt3e.bbclass 13fd2f64835873afe33fd96ebb2d538da23fbd4f
+++ classes/qt3e.bbclass 811e365ef0d4b3e9f85313437c89d53a8e7c8773
@@ -1,8 +1,8 @@
#
# override variables set by qmake_base to compile Qt/X11 apps
#
-export QTDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
-export QTEDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
+export QTDIR="${STAGING_DIR_HOST}/qte3"
+export QTEDIR="${STAGING_DIR_HOST}/qte3"
export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
============================================================
--- classes/qt3x11.bbclass 021061b87cd1c52fec22479c0efe7312a0d41898
+++ classes/qt3x11.bbclass 532e247f5a25ce05797b079449fe17bcbe679471
@@ -1,9 +1,9 @@ EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}"
EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
#
# override variables set by qmake_base to compile Qt/X11 apps
#
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
+export QTDIR = "${STAGING_DIR_HOST}/qt3"
export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3"
export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc3"
export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"
============================================================
--- packages/glibc/eglibc-initial_svn.bb 46bafc76fbe8160a3e1317fac15ef3e15e3565bb
+++ packages/glibc/eglibc-initial_svn.bb 0547991d73a5b6ba8b352b27825176d869221e0e
@@ -33,14 +33,14 @@ do_stage () {
}
do_stage () {
- oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
+ oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir=${layout_includedir} prefix="" install-headers
# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
# so do them by hand. We can tolerate an empty stubs.h for the moment.
# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
- mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
- touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
- cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
+ mkdir -p ${STAGING_INCDIR}/gnu
+ touch ${STAGING_INCDIR}/gnu/stubs.h
+ cp ${S}/include/features.h ${STAGING_INCDIR}/features.h
}
do_install () {
============================================================
--- packages/glibc/eglibc_svn.bb e0e53388d3e2f7fb82da6c0800429fb089aaa667
+++ packages/glibc/eglibc_svn.bb 2cf6a0fbb0bf1ac56fc2f096f68a8e53c4510678
@@ -90,8 +90,8 @@ do_stage() {
# make sure there isn't a conflicting libc in staging
# this should be solved differently
rm -f ${STAGING_LIBDIR}/libc.so.6
- oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
- 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+ oe_runmake 'install_root=${STAGING_DIR_HOST}' \
+ 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
'${STAGING_LIBDIR}/libc.so.6' \
install-headers install-lib
============================================================
--- packages/libpixman/libpixman_0.1.5.bb 3d21fed4e312a1e2025db7f890be18ddb6ccf26e
+++ packages/libpixman/libpixman_0.1.5.bb 7a1449b0ff23d0d12d9e4a85b9ce949c5df1b251
@@ -8,5 +8,5 @@ do_stage () {
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
============================================================
--- packages/libpixman/libpixman_0.1.6.bb 3d21fed4e312a1e2025db7f890be18ddb6ccf26e
+++ packages/libpixman/libpixman_0.1.6.bb 7a1449b0ff23d0d12d9e4a85b9ce949c5df1b251
@@ -8,5 +8,5 @@ do_stage () {
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
============================================================
--- packages/libpixman/libpixman_cvs.bb 08ff04c7c56cbb9086efff5dd14a754a431d5afe
+++ packages/libpixman/libpixman_cvs.bb a5823453577e2f977381d5054fb188fb050554cf
@@ -12,5 +12,5 @@ do_stage () {
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
============================================================
--- packages/meta/meta-toolchain.bb d53849cfd4dc2f21fcd44b4cc0926382313fc1e9
+++ packages/meta/meta-toolchain.bb 95ccbc599aa34310c2d939504ab869df02206d32
@@ -1,22 +1,22 @@ DEPENDS = "ipkg-native ipkg-utils-native
DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
-PR = "r2"
inherit sdk meta
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
+SDK_OUTPUT2 = "${SDK_DIR}/image-extras"
SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
-SDK_SUFFIX = "toolchain"
-FEED_ARCH ?= "${TARGET_ARCH}"
-
IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
-IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}"
+IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/temp-target"
TOOLCHAIN_HOST_TASK ?= "task-sdk-host"
TOOLCHAIN_TARGET_TASK ?= "task-sdk-bare"
+FEED_ARCH ?= "${TARGET_ARCH}"
+SDK_SUFFIX = "toolchain"
+TOOLCHAIN_OUTPUTNAME ?= "${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}"
RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
@@ -37,13 +37,23 @@ do_populate_sdk() {
${IPKG_TARGET} update
${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK}
- mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
- cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
- rm -rf ${SDK_OUTPUT}/${prefix}/usr/
+ mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include
+ mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/
+ mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share
+ mv ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+ rm -rf ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/
+ cp -pPR ${SDK_OUTPUT}/temp-target/usr/include/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
+ cp -pPR ${SDK_OUTPUT}/temp-target/usr/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/
+ if [ -d ${SDK_OUTPUT}/temp-target/usr/lib/.debug ]; then
+ cp -pPR ${SDK_OUTPUT}/temp-target/usr/lib/.debug/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/
+ fi
+ cp -pPR ${SDK_OUTPUT}/temp-target/usr/share/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share/
+ cp -pPR ${SDK_OUTPUT}/temp-target/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/
+ if [ -d ${SDK_OUTPUT}/temp-target/lib/.debug ]; then
+ cp -pPR ${SDK_OUTPUT}/temp-target/lib/.debug/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/
+ fi
+ rm -rf ${SDK_OUTPUT}/temp-target/
- cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
- rm -rf ${SDK_OUTPUT}/${prefix}/lib/*
-
for fn in `ls ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/`; do
if [ -h ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn ]; then
link=`readlink ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn`
@@ -55,47 +65,36 @@ do_populate_sdk() {
fi
done
- mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc ${SDK_OUTPUT}/${prefix}/lib
-
echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
# remove unwanted housekeeping files
- mv ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
- rm -Rf ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg
mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
rm -Rf ${SDK_OUTPUT}/usr/lib
# extract and store ipks, pkgdata and shlibs data
target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '`
- mkdir -p ${SDK_OUTPUT}/${prefix}/ipk/
- mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/runtime/
- mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
+ mkdir -p ${SDK_OUTPUT2}/${prefix}/ipk/
+ mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/runtime/
+ mkdir -p ${SDK_OUTPUT2}/${prefix}/${TARGET_SYS}/shlibs/
for pkg in $target_pkgs ; do
for arch in $revipkgarchs; do
pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
if [ -e $pkgnames ]; then
oenote "Found $pkgnames"
- cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/
+ cp $pkgnames ${SDK_OUTPUT2}/${prefix}/ipk/
orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
- pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
- for aarch in $revipkgarchs; do
- if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then
- pkg_subdir="${aarch}${pkg_subdir_postfix}"
- break
- fi
- done
- oenote "Original package in ${pkg_subdir}"
- mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime
- cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/
+ pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+ mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime
+ cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/
subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-`
for subpkg in $subpkgs; do
- cp ${STAGING_DIR}/pkgdata%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list