[oe-commits] org.oe.dev merge of '18890ff50a360315f132ff446f7a44ae0dcb4061'
rwhitby commit
openembedded-commits at lists.openembedded.org
Mon Dec 24 01:39:11 UTC 2007
merge of '18890ff50a360315f132ff446f7a44ae0dcb4061'
and '51181b2162a577bd188446458dc9adf512663dbb'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: a70eb4537d92437b2af4fb50a7250a04e5814ee4
ViewMTN: http://monotone.openembedded.org/revision/info/a70eb4537d92437b2af4fb50a7250a04e5814ee4
Files:
1
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/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch
conf/distro/include/angstrom-2007-preferred-versions.inc
contrib/angstrom/build-release.sh
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/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
packages/images/nas-server-image.bb
Diffs:
#
# mt diff -r18890ff50a360315f132ff446f7a44ae0dcb4061 -ra70eb4537d92437b2af4fb50a7250a04e5814ee4
#
#
#
# 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_file "packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch"
# content [5a2a6f73e42cb00d5874801d916d1359e8deafed]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [9bb6cf26f7a7451d99dda12e51b6584c26194aa5]
# to [d0ef2c36f1b3189c7ab640814486bc42402933b7]
#
# patch "contrib/angstrom/build-release.sh"
# from [24b8ff0eed78d3a8f1cd8458a76cfedb216e2cc6]
# to [9d5f537d764ff8ed751baf7c1ba2d41b8829d875]
#
# 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/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/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 9bb6cf26f7a7451d99dda12e51b6584c26194aa5
+++ conf/distro/include/angstrom-2007-preferred-versions.inc d0ef2c36f1b3189c7ab640814486bc42402933b7
@@ -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/efl1/epdf/fix-plugin-path-check.patch 917c11e702bf01b1b341e285286bb27f75393f93
+++ packages/efl1/epdf/fix-plugin-path-check.patch 5fe150879be09f990f3a76f3c8d7186e8f283c11
@@ -1,20 +1,20 @@ Index: epdf/configure.in
Index: epdf/configure.in
===================================================================
--- epdf.orig/configure.in
+++ epdf/configure.in
-@@ -27,8 +27,8 @@ PKG_CHECK_MODULES(EWL,
+@@ -95,8 +95,8 @@
+ [
+ have_ewl="yes"
+ requirements="$requirements ewl"
+- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
+- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
++ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/"
++ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/"
+ AC_SUBST(EWL_TEST_LIBS_DIR)
+ AC_SUBST(EWL_TEST_SOURCE_DIR)
+ ],
+@@ -144,7 +144,7 @@
[
- have_ewl="yes"
- requirements="$requirements ewl"
-- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
-- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
-+ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/"
-+ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/"
- AC_SUBST(EWL_TEST_LIBS_DIR)
- AC_SUBST(EWL_TEST_SOURCE_DIR)
- ],
-@@ -55,7 +55,7 @@ PKG_CHECK_MODULES(EPSILON,
- [
have_epsilon="yes"
requirements="$requirements epsilon imlib2"
- EPSILON_PLUGINS_DIR="`$PKG_CONFIG --variable=pluginsdir epsilon`"
============================================================
--- packages/efl1/epdf_cvs.bb 9250d539c8f86f2eda976014a30908c6b3905ba0
+++ packages/efl1/epdf_cvs.bb 9efa1ebb461046746f606f717f62c2d06eeda613
@@ -1,8 +1,7 @@ LICENSE = "BSD"
DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
LICENSE = "BSD"
-DEPENDS = "poppler0.6 evas ecore etk ewl"
+DEPENDS = "poppler evas ecore etk ewl"
PV = "0.1.0+cvs${SRCDATE}"
-
PR = "r1"
inherit efl_library
============================================================
--- packages/efl1/etk_cvs.bb 30cb3b710327fe056966375324ff69d0f0335450
+++ packages/efl1/etk_cvs.bb 73f6a2bacad4d3504deaf7b78fd4d80aed9a3baa
@@ -1,8 +1,8 @@ PV = "0.1.0+cvs${SRCDATE}"
DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
DEPENDS = "evas ecore edje"
LICENSE = "MIT"
PV = "0.1.0+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
inherit efl_library
@@ -15,3 +15,4 @@ FILES_${PN}-dbg += "${libdir}/etk/engine
FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/"
+RRECOMMENDS_${PN} = "${PN}-engines"
============================================================
--- packages/efl1/evas.inc 597ab85948221435b09749c151bb454d6bc7c247
+++ packages/efl1/evas.inc 4cd4cdcaa21c3ceb07a4a0332e00f4e195d48a01
@@ -35,3 +35,17 @@ PACKAGES_DYNAMIC = "libevas-engine-* lib
FILES_${PN} = "${libdir}/libevas*.so*"
PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
+
+RRECOMMENDS_${PN} = "\
+ libevas-engine-buffer \
+ libevas-engine-fb \
+ libevas-engine-software-generic \
+ libevas-engine-software-x11 \
+ libevas-engine-software-16 \
+ libevas-engine-xrender-x11 \
+ \
+ libevas-loader-png \
+ libevas-loader-jpeg \
+ libevas-loader-eet \
+ libevas-loader-svg \
+"
============================================================
--- packages/efl1/evas_cvs.bb dbafdc3234a73fe9ef33b6fb8fdc7de99921d04b
+++ packages/efl1/evas_cvs.bb 26e997cd12f7bb18a715bc41e044c55a98858c6c
@@ -1,5 +1,5 @@ require evas.inc
require evas.inc
-PR = "r3"
+PR = "r4"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
============================================================
--- packages/efl1/ewl_cvs.bb c054e8480d8c515eb1aa7d7fc623fd4d60cfd3c4
+++ packages/efl1/ewl_cvs.bb 0b0845d0af43245cad7efe54d5d63ab7dab600a2
@@ -1,11 +1,10 @@ DEPENDS = "evas ecore edje emotion efree
DESCRIPTION = "The Enlightened Widget Library, \
a simple-to-use general purpose widget library \
based on the enlightenment foundation libraries."
DEPENDS = "evas ecore edje emotion efreet epsilon"
-RSUGGESTS_${PN} += "ewl-themes"
LICENSE = "MIT"
PV = "0.5.1+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
inherit efl_library
@@ -31,3 +30,5 @@ FILES_${PN}-plugins = "${libdir}/ewl/plu
FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*"
FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*"
+
+RRECOMMENDS_${PN} = "${PN}-engines ${PN}-plugins ewl-themes"
============================================================
--- packages/xscreensaver/xscreensaver_4.22.bb 21f759df8959d61b184166c8170827d9462c75b2
+++ packages/xscreensaver/xscreensaver_4.22.bb 8062d945f2aefe017fb6e0f7804996a08281777a
@@ -8,9 +8,12 @@ DEPENDS = "intltool virtual/libx11 gtk+
LICENSE = "BSD"
DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade"
+PR = "r1"
+
SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
file://fixes.patch;patch=1 \
file://configure.in.patch;patch=1 \
+ file://configure.in-includedir.patch;patch=1 \
file://XScreenSaver"
# xscreensaver-demo is a glade app
@@ -35,6 +38,8 @@ do_configure_prepend() {
do_configure_prepend() {
sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in
+
+ export includedir="/lib"
}
do_compile() {
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh df64576fea94c73841caa9d194cca699ddf9575e
+++ packages/zaurus-updater/zaurus-updater/updater.sh 3414afa63a3d12e6a4cd900e882c8a621de05e1a
@@ -34,6 +34,11 @@
# - Reformatted file - please use spaces not tabs
# - "version check" is only on Tosa and Poodle - breaks other machines
#
+# 2007.12.23 Matthias 'CoreDump' Hentges
+# - Fix kernel install on spitz machines
+# - Unify format of do_flashing()...
+# - Display ${PR} of zaurus-updater.bb to the user
+# - Polish HDD installer messages
DATAPATH=$1
TMPPATH=/tmp/update
@@ -120,16 +125,19 @@ do_rootfs_extraction()
do_rootfs_extraction()
{
UNPACKED_ROOTFS=1
- echo 'HDD root file system'
+ echo 'Installing HDD root file system'
if [ ! -f /hdd1/NotAvailable ]; then
umount /hdd1
fi
- echo 'Now formatting...'
+ echo -n '* Now formatting...'
mke2fs $MKE2FSOPT /dev/${IDE1}1 > /dev/null 2>&1
e2fsck -p /dev/${IDE1}1 > /dev/null
if [ "$?" != "0" ]; then
+ echo "FAILED"
echo "Error: Unable to create filesystem on microdrive!"
exit "$?"
+ else
+ echo "Done"
fi
mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
@@ -139,14 +147,17 @@ do_rootfs_extraction()
fi
cd /hdd1
- echo 'Now extracting...'
+ echo -n '* Now extracting (this can take over 5m)...'
gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
if [ "$?" != "0" ]; then
+ echo "FAILED"
echo "Error: Unable to extract root filesystem archive!"
exit "$?"
+ else
+ echo "Done"
fi
- echo 'Done.'
+ echo 'HDD Installation Finished.'
# remount as RO
cd /
@@ -156,60 +167,67 @@ do_flashing()
do_flashing()
{
- if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
- then
- echo "Error: File is too big to flash!"
- echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
- return
- fi
+ if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
+ then
+ echo "Error: File is too big to flash!"
+ echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
+ return
+ fi
- if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
- then
- #check version
- /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
- if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
- then
- #no version info...
- rm -f $TMPHEAD > /dev/null 2>&1
- DATAPOS=0
- fi
- fi
+ if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
+ then
+ #check version
+ /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
+
+ if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
+ then
+ #no version info...
+ rm -f $TMPHEAD > /dev/null 2>&1
+ DATAPOS=0
+ fi
+ fi
- if [ $ISFORMATTED = 0 ]
- then
- /sbin/eraseall $TARGET_MTD > /dev/null 2>&1
- ISFORMATTED=1
- fi
+ if [ $ISFORMATTED = 0 ]
+ then
+ /sbin/eraseall $TARGET_MTD > /dev/null 2>&1
+ ISFORMATTED=1
+ fi
- echo ''
- echo '0% 100%'
- PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
- PROGSTEP=`expr 25 / $PROGSTEP`
- if [ $PROGSTEP = 0 ]
- then
- PROGSTEP=1
- fi
+ if [ -e $TMPHEAD ]
+ then
+ VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
+ MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
+ /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
- if [ -e $TMPHEAD ]
- then
- VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
- MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
- /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
- /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r51181b2162a577bd188446458dc9adf512663dbb -ra70eb4537d92437b2af4fb50a7250a04e5814ee4
#
#
#
# patch "packages/images/nas-server-image.bb"
# from [4a3d731bbbd71dc410b89cd730fedb91cfa12035]
# to [560048e8fa92ea93876cac92e66f0d4241079ad6]
#
============================================================
--- packages/images/nas-server-image.bb 4a3d731bbbd71dc410b89cd730fedb91cfa12035
+++ packages/images/nas-server-image.bb 560048e8fa92ea93876cac92e66f0d4241079ad6
@@ -22,24 +22,30 @@ DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-col
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 \
- "
+DEPENDS = "\
+ task-boot \
+ ${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \
+ task-distro-base task-machine-base \
+ ${DISTRO_SSH_DAEMON} \
+ ${DISTRO_PACKAGE_MANAGER} \
+ ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+ ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
+ task-nas-server-everything \
+ "
IMAGE_INSTALL_TASKS = "\
- task-nas-server-everything \
- "
+ 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} \
- "
+IMAGE_INSTALL = "\
+ task-boot \
+ ${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \
+ ${DISTRO_SSH_DAEMON} \
+ ${DISTRO_PACKAGE_MANAGER} \
+ ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+ ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
+ ${IMAGE_INSTALL_TASKS} \
+ "
export IMAGE_BASENAME = "nas-server-image"
IMAGE_LINGUAS = ""
More information about the Openembedded-commits
mailing list