[oe-commits] org.oe.dev merge of '4a9764846eca8e7a6608990c71feaab1b82bda1f'
freyther commit
openembedded-commits at lists.openembedded.org
Wed Dec 26 12:15:38 UTC 2007
merge of '4a9764846eca8e7a6608990c71feaab1b82bda1f'
and '541cfc2fc33004938c0e49fd51af40168cd2b1bb'
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 739655c2e19d7b069ac6a81796a7f72ea4a0cfd4
ViewMTN: http://monotone.openembedded.org/revision/info/739655c2e19d7b069ac6a81796a7f72ea4a0cfd4
Files:
1
packages/qmake/qmake2-native-2.10a
packages/qmake/qmake2-native
packages/qmake/qmake2-native_2.10a.bb
packages/qmake/qmake2-native.inc
packages/qt/qt4-x11-free-4.3.2
packages/qt/qt4-x11-free-4.3.3
packages/qt/qt4-x11-free_4.3.2.bb
packages/qt/qt4-x11-free_4.3.3.bb
packages/qte/qtopia-core_4.3.2.bb
packages/qte/qtopia-core_4.3.3.bb
packages/uicmoc/uicmoc4-native_4.3.2.bb
packages/uicmoc/uicmoc4-native_4.3.3.bb
classes/xilinx-bsp.bbclass
conf/checksums.ini
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/busybox/busybox_1.00.bb
packages/gallery/gallery_1.5.5.bb
packages/glibc/eglibc-package.bbclass
packages/glibc/glibc-package.bbclass
packages/linux/linux-dht-walnut_2.6.20.bb
packages/linux/linux-efika_2.6.20.20.bb
packages/linux/linux-efika_2.6.20.bb
packages/linux/linux-efika_2.6.21+git.bb
packages/linux/linux-magicbox_2.6.18.6.bb
packages/linux/linux-magicbox_2.6.19.2.bb
packages/linux/linux-ml403-mvista-2.6.x_git.bb
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/linux/linux-sequoia_2.6.21.bb
packages/meta/external-toolchain.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/qte/qtopia-core_4.2.0.bb
packages/uicmoc/uicmoc4-native.inc
packages/meta/unslung-binary-kernel-packages.bb
packages/gammu/gammu_1.13.0.bb
packages/gammu/gammu_1.17.0.bb
packages/python/python-gammu_0.21.bb
packages/python/python-gammu_0.24.bb
packages/fmtools
packages/fmtools/files
packages/apex/files/find-apex-partition.patch
packages/fmtools/files/makefile.patch
packages/fmtools/fmtools_1.0.2.bb
packages/images/nas-server-image.bb
packages/meta/meta-nas-server.bb
packages/tasks/task-nas-server.bb
packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch
contrib/angstrom/build-release.sh
packages/apex/apex-env_1.5.8.bb
packages/efl1/epdf/fix-plugin-path-check.patch
packages/efl1/epdf_cvs.bb
packages/efl1/etk_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/efl1/ewl_cvs.bb
packages/emacs/emacs-x11_20060801.bb
packages/emacs/emacs-x11_cvs.bb
packages/emacs/emacs_20060801.bb
packages/emacs/emacs_cvs.bb
packages/tzdata/tzdata_2007e.bb
packages/xscreensaver/xscreensaver_4.22.bb
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
packages/zaurusd/files/zaurus-hinge.bl-off
packages/zaurusd/files/zaurus-hinge.bl-on
packages/zaurusd/zaurusd_svn.bb
Diffs:
#
# mt diff -r4a9764846eca8e7a6608990c71feaab1b82bda1f -r739655c2e19d7b069ac6a81796a7f72ea4a0cfd4
#
#
#
# rename "packages/qmake/qmake2-native-2.10a"
# to "packages/qmake/qmake2-native"
#
# rename "packages/qmake/qmake2-native_2.10a.bb"
# to "packages/qmake/qmake2-native.inc"
#
# rename "packages/qt/qt4-x11-free-4.3.2"
# to "packages/qt/qt4-x11-free-4.3.3"
#
# rename "packages/qt/qt4-x11-free_4.3.2.bb"
# to "packages/qt/qt4-x11-free_4.3.3.bb"
#
# rename "packages/qte/qtopia-core_4.3.2.bb"
# to "packages/qte/qtopia-core_4.3.3.bb"
#
# rename "packages/uicmoc/uicmoc4-native_4.3.2.bb"
# to "packages/uicmoc/uicmoc4-native_4.3.3.bb"
#
# add_file "packages/qmake/qmake2-native_2.10a.bb"
# content [87d12872c36ccf6797ad38776a929652d95a4850]
#
# patch "classes/xilinx-bsp.bbclass"
# from [1c5ead4afe4f57431d3f3a5a8c80bdaf34afa9b8]
# to [e8c7ed63687307cb104b234a6c0f4b060974c982]
#
# patch "conf/checksums.ini"
# from [ce22da057e8b56ac8825b7a043b4fa7cc3f86027]
# to [8b808b2bc16a048f0af0417d52948e7da22f97ca]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [d0ef2c36f1b3189c7ab640814486bc42402933b7]
# to [9268b3e7d2f0fbdd709640014ae2f02f8460a632]
#
# patch "packages/busybox/busybox_1.00.bb"
# from [a4331e926e10003bf120d6d761b2d94e554c6ab9]
# to [cbf5fd6adad4719d56db281aafea88d874e63772]
#
# patch "packages/gallery/gallery_1.5.5.bb"
# from [08012e9bbaba0586c7721ce8bf77b816de83ebd2]
# to [733e15213ab5e6ec1bd791438af67af63d5ec35c]
#
# patch "packages/glibc/eglibc-package.bbclass"
# from [8f51cdb2c68ef10a8cc444bb9c80b76e1b529a8e]
# to [707f3f7fec8dba48bff09a80fe93f4d753d0ae20]
#
# patch "packages/glibc/glibc-package.bbclass"
# from [87de7a00ded18ae91f844d05b3fb78dd64e0fd7b]
# to [f4791b3fa7f4d093f75d3e760b405eca7feae357]
#
# patch "packages/linux/linux-dht-walnut_2.6.20.bb"
# from [62bdf8a25e2c69fa6d78f11a236567cc8e3205ea]
# to [0c179ddf00c01ed7abb520e96d914fffa789a83b]
#
# patch "packages/linux/linux-efika_2.6.20.20.bb"
# from [02bf23057848f530f4bb9b387634af8ca51c55f3]
# to [01117a66cc290abe28c789551dafbdaadaf2e6df]
#
# patch "packages/linux/linux-efika_2.6.20.bb"
# from [3d646a13d61ed36e48613a5d62ae4c153c42616e]
# to [26eb3e8b2f654dac6975e04c0e7c078417623da6]
#
# patch "packages/linux/linux-efika_2.6.21+git.bb"
# from [b07652616db0ca693ab942e5d21576b84f04e3e9]
# to [1d96763c1bba903c9753ae5d85530485bea1668d]
#
# patch "packages/linux/linux-magicbox_2.6.18.6.bb"
# from [2863c6191e6edd688014663327d3b35bfd47e9ea]
# to [9929bed5a862613d7d6d47cab1dbbed6605b127d]
#
# patch "packages/linux/linux-magicbox_2.6.19.2.bb"
# from [b03c2ca7543c5914973b54ef5b3ea159fbef77ed]
# to [f40feb36483f15f528a68ff787da7d1a1dc83f38]
#
# patch "packages/linux/linux-ml403-mvista-2.6.x_git.bb"
# from [607a3ec1212c49a8bec07ab6a9220e1868f31e6d]
# to [1627e847f526fa7073747ec037b61f626f96352f]
#
# patch "packages/linux/linux-ml403-slab-2.6.x_git.bb"
# from [9199fb7885a068659ab66b6897c7dcf1f94cf3c4]
# to [5030af659ba81e0fd39cabcfe458111ae1646763]
#
# patch "packages/linux/linux-sequoia_2.6.21.bb"
# from [91ba088cf6b7afc424eda939be7afb1dd6223594]
# to [5dc8ca7fe3e92accabff7e6dc3d9d28540f8839b]
#
# patch "packages/meta/external-toolchain.bb"
# from [32574844f3d4c4554cb6e4193123ab1c001b9046]
# to [dcaf40be62789b278a8bcf32b7d1a80010487c6a]
#
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
# from [8dfb2ad71843cf6a80cb46f17623565dbd5a95fa]
# to [f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971]
#
# patch "packages/qmake/qmake2-native.inc"
# from [d941635b01c58764ba76d411ea57f1b33b4d22eb]
# to [346b6f802856e0f31c80ec62fef076127fc5bcc5]
#
# patch "packages/qte/qtopia-core_4.2.0.bb"
# from [003bf319b5866af6b727725457754c7f73345f6d]
# to [d6737081d102288c5e64af76e569846fe24aa160]
#
# patch "packages/qte/qtopia-core_4.3.3.bb"
# from [132f2ff144e5483dcf628cf56459ce7b81f52b0f]
# to [d4c1b9cf0eb88a354b2c9eab889125d62c8cef89]
#
# patch "packages/uicmoc/uicmoc4-native.inc"
# from [00e140a2db2c4a7280faaacf41cf19e10afd1b52]
# to [6886688b3df896b25e7d22c296b444e6c7704bd2]
#
============================================================
--- packages/qmake/qmake2-native_2.10a.bb 87d12872c36ccf6797ad38776a929652d95a4850
+++ packages/qmake/qmake2-native_2.10a.bb 87d12872c36ccf6797ad38776a929652d95a4850
@@ -0,0 +1,2 @@
+QTVERSION="4.3.3"
+require ${PN}.inc
============================================================
--- classes/xilinx-bsp.bbclass 1c5ead4afe4f57431d3f3a5a8c80bdaf34afa9b8
+++ classes/xilinx-bsp.bbclass e8c7ed63687307cb104b234a6c0f4b060974c982
@@ -34,7 +34,7 @@ case "${XILINX_BOARD}" in
case "${XILINX_BOARD}" in
ML403)
oenote "ML403 board setup"
- cp -a ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \
+ cp -pPR ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \
${S}/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h
;;
============================================================
--- conf/checksums.ini ce22da057e8b56ac8825b7a043b4fa7cc3f86027
+++ conf/checksums.ini 8b808b2bc16a048f0af0417d52948e7da22f97ca
@@ -9446,13 +9446,17 @@ sha256=abc37774d327a9b1d1d35e223f014c7e9
md5=8012acea71b35c18247bd92c4721589d
sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+[ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-4.3.3.tar.gz]
+md5=19678fe35170559cd6a6fa531c57799c
+sha256=89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570
+
[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz]
md5=9519eccf0638c9962f73a7b20da77e0e
sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
-[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz]
-md5=70b729dd5dd8b2b432d685918e1971f1
-sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963
+[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz]
+md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f
+sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d
[http://keepcool.kf.tu-berlin.de/public/mitarbeiter/sadowski/qtopia-squeak-3.4-2_patched.tar.gz]
md5=0e2bab65b62784d8714057624373f70d
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc d0ef2c36f1b3189c7ab640814486bc42402933b7
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 9268b3e7d2f0fbdd709640014ae2f02f8460a632
@@ -1621,7 +1621,7 @@ PREFERRED_VERSION_qt-x11-free-native ?=
PREFERRED_VERSION_qsvn ?= "0.3.0"
PREFERRED_VERSION_qt-x11-free ?= "3.3.7"
PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5"
-PREFERRED_VERSION_qt4-x11-free ?= "4.3.2"
+PREFERRED_VERSION_qt4-x11-free ?= "4.3.3"
PREFERRED_VERSION_qtplot ?= "0.2"
PREFERRED_VERSION_quagga ?= "0.99.8"
PREFERRED_VERSION_quake1 ?= "0.0.1"
============================================================
--- packages/busybox/busybox_1.00.bb a4331e926e10003bf120d6d761b2d94e554c6ab9
+++ packages/busybox/busybox_1.00.bb cbf5fd6adad4719d56db281aafea88d874e63772
@@ -94,7 +94,7 @@ pkg_prerm_${PN} () {
# providing its files, this will make update-alternatives work, but the update-rc.d part
# for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
- cp -a /bin/busybox $tmpdir/
+ cp -pPR /bin/busybox $tmpdir/
ln -s /bin/busybox $tmpdir/[
ln -s /bin/busybox $tmpdir/test
ln -s /bin/busybox $tmpdir/head
============================================================
--- packages/gallery/gallery_1.5.5.bb 08012e9bbaba0586c7721ce8bf77b816de83ebd2
+++ packages/gallery/gallery_1.5.5.bb 733e15213ab5e6ec1bd791438af67af63d5ec35c
@@ -32,7 +32,7 @@ do_install() {
#
do_install() {
mkdir -p ${D}/${DEST_DIR} ${D}/etc/apache2/modules.d
- cp -a ${S} ${D}/${DEST_DIR}
+ cp -pPR ${S} ${D}/${DEST_DIR}
cp ${FILESDIR}/gallery.conf ${D}/etc/apache2/modules.d/95_gallery.conf
}
============================================================
--- packages/glibc/eglibc-package.bbclass 8f51cdb2c68ef10a8cc444bb9c80b76e1b529a8e
+++ packages/glibc/eglibc-package.bbclass 707f3f7fec8dba48bff09a80fe93f4d753d0ae20
@@ -150,14 +150,14 @@ do_prep_locale_tree() {
treedir=${WORKDIR}/locale-tree
rm -rf $treedir
mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
- cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n
+ cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n
# unzip to avoid parsing errors
for i in $treedir/${datadir}/i18n/charmaps/*gz; do
gunzip $i
done
- ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib
+ ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then
- cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
+ cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
fi
install -m 0755 ${D}${bindir}/localedef $treedir/bin
}
@@ -166,7 +166,7 @@ do_collect_bins_from_locale_tree() {
treedir=${WORKDIR}/locale-tree
mkdir -p ${D}${libdir}
- cp -a $treedir/${libdir}/locale ${D}${libdir}
+ cp -pPR $treedir/${libdir}/locale ${D}${libdir}
}
python package_do_split_gconvs () {
============================================================
--- packages/glibc/glibc-package.bbclass 87de7a00ded18ae91f844d05b3fb78dd64e0fd7b
+++ packages/glibc/glibc-package.bbclass f4791b3fa7f4d093f75d3e760b405eca7feae357
@@ -141,17 +141,17 @@ do_prep_locale_tree() {
treedir=${WORKDIR}/locale-tree
rm -rf $treedir
mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
- cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n
+ cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n
# unzip to avoid parsing errors
for i in $treedir/${datadir}/i18n/charmaps/*gz; do
gunzip $i
done
- ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib
+ ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then
- cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
+ cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
fi
if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then
- cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
+ cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
fi
install -m 0755 ${D}${bindir}/localedef $treedir/bin
}
@@ -160,7 +160,7 @@ do_collect_bins_from_locale_tree() {
treedir=${WORKDIR}/locale-tree
mkdir -p ${D}${libdir}
- cp -a $treedir/${libdir}/locale ${D}${libdir}
+ cp -pPR $treedir/${libdir}/locale ${D}${libdir}
}
python package_do_split_gconvs () {
============================================================
--- packages/linux/linux-dht-walnut_2.6.20.bb 62bdf8a25e2c69fa6d78f11a236567cc8e3205ea
+++ packages/linux/linux-dht-walnut_2.6.20.bb 0c179ddf00c01ed7abb520e96d914fffa789a83b
@@ -35,11 +35,11 @@ do_stage_append () {
#need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
install -d ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
- cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
- cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
}
============================================================
--- packages/linux/linux-efika_2.6.20.20.bb 02bf23057848f530f4bb9b387634af8ca51c55f3
+++ packages/linux/linux-efika_2.6.20.20.bb 01117a66cc290abe28c789551dafbdaadaf2e6df
@@ -63,12 +63,12 @@ do_stage_append () {
#need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
install -d ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
install -d ${STAGING_KERNEL_DIR}/include/asm
- cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
- cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
}
do_deploy() {
============================================================
--- packages/linux/linux-efika_2.6.20.bb 3d646a13d61ed36e48613a5d62ae4c153c42616e
+++ packages/linux/linux-efika_2.6.20.bb 26eb3e8b2f654dac6975e04c0e7c078417623da6
@@ -60,12 +60,12 @@ do_stage_append () {
#need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
install -d ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
install -d ${STAGING_KERNEL_DIR}/include/asm
- cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
- cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
}
============================================================
--- packages/linux/linux-efika_2.6.21+git.bb b07652616db0ca693ab942e5d21576b84f04e3e9
+++ packages/linux/linux-efika_2.6.21+git.bb 1d96763c1bba903c9753ae5d85530485bea1668d
@@ -47,12 +47,12 @@ do_stage_append () {
#need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
install -d ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
install -d ${STAGING_KERNEL_DIR}/include/asm
- cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
- cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
}
do_deploy() {
============================================================
--- packages/linux/linux-magicbox_2.6.18.6.bb 2863c6191e6edd688014663327d3b35bfd47e9ea
+++ packages/linux/linux-magicbox_2.6.18.6.bb 9929bed5a862613d7d6d47cab1dbbed6605b127d
@@ -44,11 +44,11 @@ do_stage_append () {
#need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
install -d ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
- cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
- cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
}
============================================================
--- packages/linux/linux-magicbox_2.6.19.2.bb b03c2ca7543c5914973b54ef5b3ea159fbef77ed
+++ packages/linux/linux-magicbox_2.6.19.2.bb f40feb36483f15f528a68ff787da7d1a1dc83f38
@@ -77,11 +77,11 @@ do_stage_append () {
#need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
install -d ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
- cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+ cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
- cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
- cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+ cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r541cfc2fc33004938c0e49fd51af40168cd2b1bb -r739655c2e19d7b069ac6a81796a7f72ea4a0cfd4
#
#
#
# delete "packages/meta/unslung-binary-kernel-packages.bb"
#
# rename "packages/gammu/gammu_1.13.0.bb"
# to "packages/gammu/gammu_1.17.0.bb"
#
# rename "packages/python/python-gammu_0.21.bb"
# to "packages/python/python-gammu_0.24.bb"
#
# add_dir "packages/fmtools"
#
# add_dir "packages/fmtools/files"
#
# add_file "packages/apex/files/find-apex-partition.patch"
# content [a1985a204e000e121aa7918bb0754ef375def89a]
#
# add_file "packages/fmtools/files/makefile.patch"
# content [9867b4fde17b60384925b1bd502bdde2cc250d30]
#
# add_file "packages/fmtools/fmtools_1.0.2.bb"
# content [4543389e888358f731bc6de60f770a46474047d5]
#
# add_file "packages/images/nas-server-image.bb"
# content [4a3d731bbbd71dc410b89cd730fedb91cfa12035]
#
# add_file "packages/meta/meta-nas-server.bb"
# content [9c2144c3cf312ea4f3c3d49d14faace452af7137]
#
# add_file "packages/tasks/task-nas-server.bb"
# content [62167ff91124b6983115d92bd330e863aac1d877]
#
# add_file "packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch"
# content [5a2a6f73e42cb00d5874801d916d1359e8deafed]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [6b4f0187c2c194773b7c4c6c9b350586c0c7541f]
# to [9268b3e7d2f0fbdd709640014ae2f02f8460a632]
#
# patch "contrib/angstrom/build-release.sh"
# from [24b8ff0eed78d3a8f1cd8458a76cfedb216e2cc6]
# to [9d5f537d764ff8ed751baf7c1ba2d41b8829d875]
#
# patch "packages/apex/apex-env_1.5.8.bb"
# from [fdbc0b6132572b780b950c96db6cdd6c7f609f7d]
# to [802ae62b74a85155710d25eb4ad8101aab3c8f44]
#
# patch "packages/efl1/epdf/fix-plugin-path-check.patch"
# from [917c11e702bf01b1b341e285286bb27f75393f93]
# to [5fe150879be09f990f3a76f3c8d7186e8f283c11]
#
# patch "packages/efl1/epdf_cvs.bb"
# from [9250d539c8f86f2eda976014a30908c6b3905ba0]
# to [9efa1ebb461046746f606f717f62c2d06eeda613]
#
# patch "packages/efl1/etk_cvs.bb"
# from [30cb3b710327fe056966375324ff69d0f0335450]
# to [73f6a2bacad4d3504deaf7b78fd4d80aed9a3baa]
#
# patch "packages/efl1/evas.inc"
# from [597ab85948221435b09749c151bb454d6bc7c247]
# to [4cd4cdcaa21c3ceb07a4a0332e00f4e195d48a01]
#
# patch "packages/efl1/evas_cvs.bb"
# from [dbafdc3234a73fe9ef33b6fb8fdc7de99921d04b]
# to [26e997cd12f7bb18a715bc41e044c55a98858c6c]
#
# patch "packages/efl1/ewl_cvs.bb"
# from [c054e8480d8c515eb1aa7d7fc623fd4d60cfd3c4]
# to [0b0845d0af43245cad7efe54d5d63ab7dab600a2]
#
# patch "packages/emacs/emacs-x11_20060801.bb"
# from [3457ad840b0a38bfeae7e4a3897f212239fa70ce]
# to [965432a87967e099882c8d5767b456e842a1cb0c]
#
# patch "packages/emacs/emacs-x11_cvs.bb"
# from [e2638065bea198c09881bfdf17fc0eb51453f52e]
# to [322f28739cb2678d3893ad38afada26290e8a22c]
#
# patch "packages/emacs/emacs_20060801.bb"
# from [8060faa2c6603fe0867d73fd9f4b767a982fc6ee]
# to [797283b86be34c26ed52e37b9e07109226c07cce]
#
# patch "packages/emacs/emacs_cvs.bb"
# from [d51efb8e267b4e8787cb7949c043ba6a32691233]
# to [3aa46cad86255469e86d4335acb761ff26758023]
#
# patch "packages/tzdata/tzdata_2007e.bb"
# from [4cec1441747911151c67dda8bbb5631ff1c92169]
# to [372c0e1baf2b1ab4f6293f9fb5d4903e37f0f381]
#
# patch "packages/xscreensaver/xscreensaver_4.22.bb"
# from [21f759df8959d61b184166c8170827d9462c75b2]
# to [8062d945f2aefe017fb6e0f7804996a08281777a]
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [df64576fea94c73841caa9d194cca699ddf9575e]
# to [3414afa63a3d12e6a4cd900e882c8a621de05e1a]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [cf372a56d0952ca445d801dd6b169d120224b6f2]
# to [f8f7bbf562514bec8076212836576397889ee6ed]
#
# patch "packages/zaurusd/files/zaurus-hinge.bl-off"
# from [87e4a1fb6db37f2ea10378ad5f16b108e4d776ae]
# to [6f591519f65c3c93084f72f6f9665b4d6920f88d]
#
# patch "packages/zaurusd/files/zaurus-hinge.bl-on"
# from [a404c868701b2d3e35654159015ae6d17b9e7a9d]
# to [e8eff8a10926cc988aed7fb54f69feb14c703831]
#
# patch "packages/zaurusd/zaurusd_svn.bb"
# from [1c6948752ce366ab73d19f934f67c028b61ebc87]
# to [1d13c932ce4f3b43ef8ad3c05abb7f9e95de0566]
#
============================================================
--- packages/apex/files/find-apex-partition.patch a1985a204e000e121aa7918bb0754ef375def89a
+++ packages/apex/files/find-apex-partition.patch a1985a204e000e121aa7918bb0754ef375def89a
@@ -0,0 +1,34 @@
+*** usr/link.cc.orig Sun Dec 23 20:31:49 2007
+--- usr/link.cc Sun Dec 23 20:32:46 2007
+***************
+*** 278,285 ****
+ fixed-up env_link structure, scanning for the environment variables
+ and their defaults, and opening the flash instance of the
+ environment. It first looks for the "Loader" partition. If there
+! is none, it uses the first partition with the assumption that APEX
+! may be the primary boot loader.
+
+ */
+
+--- 278,286 ----
+ fixed-up env_link structure, scanning for the environment variables
+ and their defaults, and opening the flash instance of the
+ environment. It first looks for the "Loader" partition. If there
+! is none, it then looks for the "apex" partition. If there is none,
+! it uses the first partition with the assumption that APEX may be
+! the primary boot loader.
+
+ */
+
+***************
+*** 289,294 ****
+--- 290,298 ----
+ MTDPartition mtd = MTDPartition::find ("Loader");
+
+ if (!mtd.is ())
++ mtd = MTDPartition::find ("apex");
++
++ if (!mtd.is ())
+ mtd = MTDPartition::first ();
+
+ bool fFound = mtd.is () && open_apex (mtd);
============================================================
--- packages/fmtools/files/makefile.patch 9867b4fde17b60384925b1bd502bdde2cc250d30
+++ packages/fmtools/files/makefile.patch 9867b4fde17b60384925b1bd502bdde2cc250d30
@@ -0,0 +1,11 @@
+--- fmtools-1.0.2/Makefile 2002-08-17 06:05:09.000000000 +0200
++++ fmtools-1.0.2p/Makefile 2007-12-22 21:45:28.000000000 +0100
+@@ -1,8 +1,5 @@
+ # fmtools Makefile - just the basics for now
+
+-CC = gcc
+-CFLAGS = -Wall -O2
+-
+ INSTALL = /usr/bin/install
+
+ # Since fmtools doesn't use configure, these paths are provided here
============================================================
--- packages/fmtools/fmtools_1.0.2.bb 4543389e888358f731bc6de60f770a46474047d5
+++ packages/fmtools/fmtools_1.0.2.bb 4543389e888358f731bc6de60f770a46474047d5
@@ -0,0 +1,15 @@
+DESCRIPTION = "fmtools - programs for Video for Linux radio cards"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.stanford.edu/~blp/fmtools/fmtools-1.0.2.tar.gz \
+ file://makefile.patch;patch=1"
+
+inherit autotools
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/fm ${D}${bindir}/fm
+ install -m 0755 ${S}/fmscan ${D}${bindir}/fmscan
+}
+
============================================================
--- packages/images/nas-server-image.bb 4a3d731bbbd71dc410b89cd730fedb91cfa12035
+++ packages/images/nas-server-image.bb 4a3d731bbbd71dc410b89cd730fedb91cfa12035
@@ -0,0 +1,47 @@
+# This image is intended to provide a configuration
+# for a network attached storage server device.
+
+# Key features are:
+#
+# 1) Must be able to mount attached storage devices like
+# internal disks, external USB disks, etc. Should support
+# various filesystem choices, but ext2 at a minimum.
+#
+# 2) Must be able to boot from internal flash, or directly
+# from a filesystem stored on the attached storage.
+#
+# 3) Must be able to share that storage across the network
+# using various protocols like Samba, NFS, etc.
+#
+# 4) Bonus points for being able to support other central
+# network services like a central gateway machine might.
+
+# Although it is tested with the Angstrom distro, it is
+# intended to be distro-agnostic.
+
+DISTRO_SSH_DAEMON ?= "dropbear"
+DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+
+DEPENDS = "task-boot task-base-apex \
+ task-distro-base task-machine-base \
+ ${DISTRO_SSH_DAEMON} \
+ ${DISTRO_PACKAGE_MANAGER} \
+ task-base-usbhost task-base-ext2 \
+ task-nas-server-everything \
+ "
+
+IMAGE_INSTALL_TASKS = "\
+ task-nas-server-everything \
+ "
+
+IMAGE_INSTALL = "task-boot task-base-apex \
+ ${DISTRO_SSH_DAEMON} \
+ ${DISTRO_PACKAGE_MANAGER} \
+ task-base-usbhost task-base-ext2 \
+ ${IMAGE_INSTALL_TASKS} \
+ "
+
+export IMAGE_BASENAME = "nas-server-image"
+IMAGE_LINGUAS = ""
+
+inherit image
============================================================
--- packages/meta/meta-nas-server.bb 9c2144c3cf312ea4f3c3d49d14faace452af7137
+++ packages/meta/meta-nas-server.bb 9c2144c3cf312ea4f3c3d49d14faace452af7137
@@ -0,0 +1,10 @@
+DESCRIPTION = "Meta-package for a network attached storage server"
+LICENSE = "MIT"
+PR = "r0"
+
+RDEPENDS = "\
+ task-nas-server-everything \
+ "
+
+inherit meta
+
============================================================
--- packages/tasks/task-nas-server.bb 62167ff91124b6983115d92bd330e863aac1d877
+++ packages/tasks/task-nas-server.bb 62167ff91124b6983115d92bd330e863aac1d877
@@ -0,0 +1,94 @@
+DESCRIPTION = "Tasks for a Network Attached Storage server"
+LICENSE = "MIT"
+PROVIDES = "task-nas-server-everything"
+PR = "r0"
+
+inherit task
+
+PACKAGES = "\
+ task-nas-server-everything \
+ ${NAS_SERVER_PACKAGES} \
+"
+
+NAS_SERVER_PACKAGES = "\
+ task-nas-server-base \
+ task-nas-server-samba \
+ task-nas-server-dnsmasq \
+ task-nas-server-iptables \
+ task-nas-server-tzdata \
+ task-nas-server-nfs \
+ task-nas-server-vfat \
+ task-nas-server-ntfs \
+ task-nas-server-ext3 \
+ task-nas-server-reiserfs \
+"
+
+RDEPENDS_task-nas-server-everything = "${NAS_SERVER_PACKAGES}"
+
+DESCRIPTION_task-nas-server-base = "NAS-Server: Base Packages"
+RDEPENDS_task-nas-server-base = "\
+"
+RRECOMMENDS_task-nas-server-base = "\
+"
+
+DESCRIPTION_task-nas-server-samba = "NAS-Server: Samba Server"
+RDEPENDS_task-nas-server-samba = "\
+ samba swat \
+"
+RRECOMMENDS_task-nas-server-samba = "\
+"
+
+DESCRIPTION_task-nas-server-dnsmasq = "NAS-Server: DNS/DHCP Server"
+RDEPENDS_task-nas-server-dnsmasq = "\
+ dnsmasq \
+"
+RRECOMMENDS_task-nas-server-dnsmasq = "\
+"
+
+DESCRIPTION_task-nas-server-iptables = "NAS-Server: Netfilter/Iptables Support"
+RDEPENDS_task-nas-server-iptables = "\
+ iptables \
+"
+RRECOMMENDS_task-nas-server-iptables = "\
+ kernel-module-iptable-nat \
+ kernel-module-iptable-mangle \
+ kernel-module-ipt-masquerade \
+"
+
+DESCRIPTION_task-nas-server-tzdata = "NAS-Server: Timezone Support"
+RDEPENDS_task-nas-server-tzdata = "\
+ tzdata \
+"
+RRECOMMENDS_task-nas-server-tzdata = "\
+"
+
+DESCRIPTION_task-nas-server-nfs = "NAS-Server: NFS Server"
+RDEPENDS_task-nas-server-nfs = "\
+ nfs-utils portmap \
+"
+RRECOMMENDS_task-nas-server-nfs = "\
+"
+
+DESCRIPTION_task-nas-server-vfat = "NAS-Server: FAT Filesystem"
+RDEPENDS_task-nas-server-vfat = "\
+"
+RRECOMMENDS_task-nas-server-vfat = "\
+"
+
+DESCRIPTION_task-nas-server-ntfs = "NAS-Server: NTFS Filesystem"
+RDEPENDS_task-nas-server-ntfs = "\
+"
+RRECOMMENDS_task-nas-server-ntfs = "\
+"
+
+DESCRIPTION_task-nas-server-ext3 = "NAS-Server: EXT3 Filesystem"
+RDEPENDS_task-nas-server-ext3 = "\
+"
+RRECOMMENDS_task-nas-server-ext3 = "\
+"
+
+DESCRIPTION_task-nas-server-reiserfs = "NAS-Server: ReiserFS Filesystem"
+RDEPENDS_task-nas-server-reiserfs = "\
+"
+RRECOMMENDS_task-nas-server-reiserfs = "\
+"
============================================================
--- packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch 5a2a6f73e42cb00d5874801d916d1359e8deafed
+++ packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch 5a2a6f73e42cb00d5874801d916d1359e8deafed
@@ -0,0 +1,72 @@
+--- xscreensaver-4.22/configure.in.orig 2007-12-23 18:33:43.000000000 +0000
++++ xscreensaver-4.22/configure.in 2007-12-23 18:35:33.000000000 +0000
+@@ -944,9 +944,6 @@
+ #
+ AC_DEFUN(AC_CHECK_X_HEADER, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+ CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -955,9 +952,6 @@
+ #
+ AC_DEFUN(AC_EGREP_X_HEADER, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ AC_EGREP_HEADER([$1], [$2], [$3], [$4])
+ CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -966,9 +960,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_COMPILE, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+ CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -982,9 +973,6 @@
+ ac_save_LDFLAGS="$LDFLAGS"
+ # ac_save_LIBS="$LIBS"
+
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ # note: $X_CFLAGS includes $x_includes
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+@@ -1005,9 +993,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_RUN, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ AC_TRY_RUN([$1], [$2], [$3], [$4])
+ CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -2763,9 +2748,6 @@
+ EOF
+
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+ mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep configure:`
+@@ -3395,9 +3377,6 @@
+ DEPEND_DEFINES=
+
+
+-if test \! -z "$includedir" ; then
+- INCLUDES="$INCLUDES -I$includedir"
+-fi
+
+ if test \! -z "$libdir" ; then
+ LDFLAGS="$LDFLAGS -L$libdir"
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc 6b4f0187c2c194773b7c4c6c9b350586c0c7541f
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 9268b3e7d2f0fbdd709640014ae2f02f8460a632
@@ -174,7 +174,7 @@ PREFERRED_VERSION_clish ?= "0.7.1"
PREFERRED_VERSION_classpath-minimal-native ?= "0.95"
PREFERRED_VERSION_clearsilver ?= "0.10.3"
PREFERRED_VERSION_clish ?= "0.7.1"
-PREFERRED_VERSION_cmake-native ?= "2.2.3"
+PREFERRED_VERSION_cmake-native ?= "2.4.7"
PREFERRED_VERSION_cms92init ?= "0.1"
PREFERRED_VERSION_compositeproto ?= "0.4"
PREFERRED_VERSION_comprec ?= "0.02"
@@ -422,7 +422,7 @@ PREFERRED_VERSION_gamin ?= "0.1.8"
PREFERRED_VERSION_galculator ?= "1.2.3"
PREFERRED_VERSION_gallery ?= "1.5.5"
PREFERRED_VERSION_gamin ?= "0.1.8"
-PREFERRED_VERSION_gammu ?= "1.13.0"
+PREFERRED_VERSION_gammu ?= "1.17.0"
PREFERRED_VERSION_gawk ?= "3.1.4"
PREFERRED_VERSION_gawk-native ?= "3.1.4"
PREFERRED_VERSION_gcalctool ?= "5.7.32"
@@ -1169,7 +1169,6 @@ PREFERRED_VERSION_madplay ?= "0.15.2b"
PREFERRED_VERSION_macchanger ?= "1.5.0"
PREFERRED_VERSION_madfu ?= "1.2"
PREFERRED_VERSION_madplay ?= "0.15.2b"
-PREFERRED_VERSION_madwifi-ng ?= "r2518-20070626"
PREFERRED_VERSION_mahjongg ?= "1.0.0"
PREFERRED_VERSION_mailutils ?= "0.3.1"
PREFERRED_VERSION_mailx ?= "8.1.2-0.20050715cvs"
@@ -1502,7 +1501,7 @@ PREFERRED_VERSION_python-fpconst ?= "0.6
PREFERRED_VERSION_python-fam ?= "1.1.1"
PREFERRED_VERSION_python-fnorb ?= "1.3"
PREFERRED_VERSION_python-fpconst ?= "0.6.0"
-PREFERRED_VERSION_python-gammu ?= "0.21"
+PREFERRED_VERSION_python-gammu ?= "0.24"
PREFERRED_VERSION_python-gmpy ?= "1.0.1"
PREFERRED_VERSION_python-gnosis ?= "1.2.2"
PREFERRED_VERSION_python-gst ?= "0.10.8"
============================================================
--- contrib/angstrom/build-release.sh 24b8ff0eed78d3a8f1cd8458a76cfedb216e2cc6
+++ contrib/angstrom/build-release.sh 9d5f537d764ff8ed751baf7c1ba2d41b8829d875
@@ -69,7 +69,7 @@ done
done
# graphics, flash storage
-for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie simpad
+for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad
do
BUILD_CLEAN="base-files"
BUILD_MACHINE=$machine
============================================================
--- packages/apex/apex-env_1.5.8.bb fdbc0b6132572b780b950c96db6cdd6c7f609f7d
+++ packages/apex/apex-env_1.5.8.bb 802ae62b74a85155710d25eb4ad8101aab3c8f44
@@ -1,11 +1,13 @@ LICENSE = "GPL"
DESCRIPTION = "APEX%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list