[oe-commits] org.oe.dev merge of '554d1c13766299b9a5323f5553876072c65d7ff3'
Laibsch commit
openembedded-commits at lists.openembedded.org
Thu Jul 5 02:58:50 UTC 2007
merge of '554d1c13766299b9a5323f5553876072c65d7ff3'
and 'af8f1b43cae9921ff350477f84ee9b687a2c1544'
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 360125bf8e4b1686562c238aa2d44e786b332919
ViewMTN: http://monotone.openembedded.org/revision.psp?id=360125bf8e4b1686562c238aa2d44e786b332919
Files:
1
packages/gtkmm/gtkmm.inc
packages/opie-init/opie-init/c7x0/opie
packages/opie-init/opie-init/mnci/opie
packages/atk/atk_1.19.3.bb
packages/opie-multikey/files/fix-rpath.patch
packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch
packages/uclibc/files/errno_values.h.patch
packages/uclibc/files/termios.h.patch
packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch
classes/opie.bbclass
classes/palmtop.bbclass
classes/sanity.bbclass
classes/sdk.bbclass
conf/bitbake.conf
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
packages/gpephone/xoo-vm_0.7-20070204.bb
packages/libopie/libopie2.inc
packages/libopie/libopie2_cvs.bb
packages/libopietooth/libopietooth1.inc
packages/libopietooth/libopietooth1_cvs.bb
packages/libqpe/libqpe-opie.inc
packages/libqpe/libqpe-opie_cvs.bb
packages/libqtaux/libqtaux2.inc
packages/linux/linux-x86-2.6.20/i486-defconfig
packages/linux/linux-x86_2.6.20.bb
packages/meta/meta-sdk-gpe.bb
packages/meta/meta-sdk.bb
packages/opie-alarm/opie-alarm.inc
packages/opie-alarm/opie-alarm_cvs.bb
packages/opie-init/opie-init/opie
packages/opie-init/opie-init.inc
packages/opie-init/opie-init_1.2.2.bb
packages/opie-multikey/opie-multikey_cvs.bb
packages/opie-networksettings/opie-networksettings.inc
packages/opie-networksettings/opie-networksettings_cvs.bb
packages/opie-qcop/opie-qcop.inc
packages/opie-qcop/opie-qcop_cvs.bb
packages/opie-qss/opie-qss.inc
packages/opie-qss/opie-qss_cvs.bb
packages/opie-quicklauncher/opie-quicklauncher.inc
packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
packages/opie-taskbar/opie-taskbar.inc
packages/opie-taskbar/opie-taskbar_cvs.bb
packages/opie-ttf-support/opie-ttf-support_1.1.bb
packages/qemu/qemu-native.inc
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
packages/uclibc/uclibc_0.9.29.bb
packages/uicmoc/uicmoc-native_2.3.10.bb
Diffs:
#
# mt diff -r554d1c13766299b9a5323f5553876072c65d7ff3 -r360125bf8e4b1686562c238aa2d44e786b332919
#
#
#
# patch "packages/gtkmm/gtkmm.inc"
# from [5daa50929bf91d353c37e24808bdcf6ffe37866c]
# to [c99e2e2f13acddd410f35d4c40468e00186e71fb]
#
============================================================
--- packages/gtkmm/gtkmm.inc 5daa50929bf91d353c37e24808bdcf6ffe37866c
+++ packages/gtkmm/gtkmm.inc c99e2e2f13acddd410f35d4c40468e00186e71fb
@@ -1,10 +1,9 @@ LICENSE = "LGPL"
DESCRIPTION = "C++ bindings for the GTK+ toolkit."
HOMEPAGE = "http://www.gtkmm.org/"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
-DEPENDS = "atk glibmm gtk+"
-PR = "r0"
+DEPENDS = "atk glibmm gtk+ cairomm"
inherit gnome autotools pkgconfig flow-lossage
#
# mt diff -raf8f1b43cae9921ff350477f84ee9b687a2c1544 -r360125bf8e4b1686562c238aa2d44e786b332919
#
#
#
# delete "packages/opie-init/opie-init/c7x0/opie"
#
# delete "packages/opie-init/opie-init/mnci/opie"
#
# add_file "packages/atk/atk_1.19.3.bb"
# content [656b768718fa0fb3c29376f5b6d2cecb01f2f4c1]
#
# add_file "packages/opie-multikey/files/fix-rpath.patch"
# content [c1275cf0c3e1eac9898ee5c1bb9b3ff0ba0f0486]
#
# add_file "packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch"
# content [3149f72c0600716f90b9ece4df7300b28f3c5dee]
#
# add_file "packages/uclibc/files/errno_values.h.patch"
# content [449baeeb6e48f88f75f07d09cdee9bd3ffcba48e]
#
# add_file "packages/uclibc/files/termios.h.patch"
# content [a49212a1ef49d0a938f6687ab867600f05b3f1a4]
#
# add_file "packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch"
# content [80a6d114216133cf5b84be77d9090ced7721b591]
#
# patch "classes/opie.bbclass"
# from [2653571d91e93ff5043997740e80656344ad35d8]
# to [441638d80c7d1595e6037940f20b24b8bca48ebd]
#
# patch "classes/palmtop.bbclass"
# from [47dee0d1bcbc560241a59d1d1689a90ca8e37b3f]
# to [56d2e8dc703cfb39ea14ec0fc013546fcd6a20bb]
#
# patch "classes/sanity.bbclass"
# from [cebf5a2ee9519f8342891e74db6ab2aaa370b992]
# to [dcb94eb7036e5db9888430963dfbead08880632d]
#
# patch "classes/sdk.bbclass"
# from [f5a6cb53cd1f28070b6b61af23f5004767157e55]
# to [100957b869cd48dd7933ace807f396c946442a32]
#
# patch "conf/bitbake.conf"
# from [4481b02aa24ad52f996889ffadf4f12e9912c116]
# to [28be7aa3c03959211fa8fff38d1903e1ec2dd8de]
#
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
# from [5f9b174bd679d8f5b634fdcde2cddde0853a9369]
# to [5045ef2e767e1eb852ad651743f8406528e34237]
#
# patch "packages/gpephone/xoo-vm_0.7-20070204.bb"
# from [5228f8e9c69a2d20caea19ae8d355fdf2a5295bb]
# to [75d7ab96fd0fb00311b37907ddb10da84d8bef4e]
#
# patch "packages/libopie/libopie2.inc"
# from [1473fa57b6e31b62c32c3f467f79fb57b52dc658]
# to [46a70b5412163b8031b130f39a8726cfbb93dd6b]
#
# patch "packages/libopie/libopie2_cvs.bb"
# from [66b355cdaf0863882ba11282e95ea14ad73da233]
# to [5bb0e0ab2a48fe329bb2f0f14bf1d5f9e3b8af87]
#
# patch "packages/libopietooth/libopietooth1.inc"
# from [c21cf9e9a7e0dea60da73327864bd21d66ad8e8a]
# to [e59ef172e1966dd379dcb4b605c11edc65d8ba97]
#
# patch "packages/libopietooth/libopietooth1_cvs.bb"
# from [d5762ce00b24d296f0b7f5a2706bea8fc623480e]
# to [4b37cb3e703e6e899c9ae8fe5bd1ac58dbbb0147]
#
# patch "packages/libqpe/libqpe-opie.inc"
# from [3346fde77506aea54b8d7d57c5fe1dcae017a6ca]
# to [c1bd05f4b3fca2a8fb673bea16b9192a4c6a1dc3]
#
# patch "packages/libqpe/libqpe-opie_cvs.bb"
# from [f96cc1aefe160f38dd0536ab17ca7a8896d39937]
# to [66eb84a06f4f226608fdaccbcc077ac5fb2e540e]
#
# patch "packages/libqtaux/libqtaux2.inc"
# from [5250f41cd924ff8df098caa6a7e0729af80c2553]
# to [0c427ee2ab568405ca1b63c3b4c07177b5963b94]
#
# patch "packages/linux/linux-x86-2.6.20/i486-defconfig"
# from [eaeef6226e5d7f2bff7c3cadede34d438f45330a]
# to [cff3c0080167dd8eefe97ec8f9ba2f6e1b60269d]
#
# patch "packages/linux/linux-x86_2.6.20.bb"
# from [0f6a1d20b4dcd3f8f28bcd7434bd8c778f6494de]
# to [3221d944ae3c2cbf3030007c7cc3d0ac8f0ff3f0]
#
# patch "packages/meta/meta-sdk-gpe.bb"
# from [47ea869e6d4ac18d47ca62a018ebea80da185c55]
# to [911556373f204b869c56247be3aa3b40fc1f128a]
#
# patch "packages/meta/meta-sdk.bb"
# from [07d62cef69fc1e5ce78c9473a1807dab6b7e1a55]
# to [807b4b0871d6078e260e5f860e81d01c4d38a7b1]
#
# patch "packages/opie-alarm/opie-alarm.inc"
# from [4a1a59205a8611a22b1346bc7f42b353e20d5652]
# to [07de57bed4ed8e3cb6e9d63ab283f3914598dc35]
#
# patch "packages/opie-alarm/opie-alarm_cvs.bb"
# from [1796ca94836c627bd6abf2690d14a343efbdf8ee]
# to [2bdbe943e8bc210a02a9065675475fe62b3d1b31]
#
# patch "packages/opie-init/opie-init/opie"
# from [939a977703c5c993189c8355d175b621bfe71969]
# to [93b7f76dcb458b0a64b1675729ab077b8f12daf6]
#
# patch "packages/opie-init/opie-init.inc"
# from [5fcdf1ce5c56a1de2a9bf4ff41be0f31abe3b52d]
# to [d712bf62a00db9475cc0d6bc511012e02a6ae815]
#
# patch "packages/opie-init/opie-init_1.2.2.bb"
# from [c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9]
# to [1780c7093e5c02aea9b70522d452841ba424f856]
#
# patch "packages/opie-multikey/opie-multikey_cvs.bb"
# from [2254fb5be4ca2f2ed96362209f6d3ba3a030ab1a]
# to [eeeb85a14c02e906b881fe457e35e8b763c7a532]
#
# patch "packages/opie-networksettings/opie-networksettings.inc"
# from [97e2373b09df75c93aea7b014dfd9090f50fe171]
# to [eb022a472b604f09c97ffb9d451798e9451c16fa]
#
# patch "packages/opie-networksettings/opie-networksettings_cvs.bb"
# from [fdf639c975afaedf8b2ce6fc7b065b61b9205e7d]
# to [68708b9ebf72a6e166db6c397ee9a0419886312d]
#
# patch "packages/opie-qcop/opie-qcop.inc"
# from [5a2b1a1f0ec2d69a4d4c851c4d6ac6c50ca0a49d]
# to [fcf1b2682b07002f61b4f423c9ba3de8f1267a93]
#
# patch "packages/opie-qcop/opie-qcop_cvs.bb"
# from [c2097d44582c668bbb719ae77cb032333a4a58de]
# to [13db751dc05218bcda19c0254130a3083f6f6137]
#
# patch "packages/opie-qss/opie-qss.inc"
# from [24500a4faeeb7c466f109bbac2d55ad32a0de673]
# to [35451379dab7f75ba605b88c3ff29bb4f09d8641]
#
# patch "packages/opie-qss/opie-qss_cvs.bb"
# from [197567cb76e69706001149dcace45820034867bb]
# to [f270446f9bf86f9676a307c3f33e54275536b6d6]
#
# patch "packages/opie-quicklauncher/opie-quicklauncher.inc"
# from [08c19f70c27a55e7af90b65ca9f2bbf5a36a8f55]
# to [48fe0abf27157f260e622aa3abfa2c54ea2a92ed]
#
# patch "packages/opie-quicklauncher/opie-quicklauncher_cvs.bb"
# from [d844e5142763e1aa87b5ceba214d3ba4a89a8606]
# to [f9d1805249f9ed2056460ce0eb86fc1977af98e3]
#
# patch "packages/opie-taskbar/opie-taskbar.inc"
# from [5e37066e544b2568997efb629a7497162c167149]
# to [612634b0a0376dfe1e4b563804c51987a32320b0]
#
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
# from [6e4c569e12d7cb8d875e488eac41f12c82db84a9]
# to [0081cd5790b5ddf838977339678872f2b347b50c]
#
# patch "packages/opie-ttf-support/opie-ttf-support_1.1.bb"
# from [485a535dc2b358d5755ccec0f9697b159b0bb964]
# to [4dc8b9267c72d84126fbce18970082e888865a36]
#
# patch "packages/qemu/qemu-native.inc"
# from [a6c0e5a75f0d0228a83c274f444a11031af95f6c]
# to [71d3322a1e1cff08495c023c071fdd6a29e15a80]
#
# patch "packages/qte/qte-common_2.3.10.inc"
# from [77b17aa1d6610e4d5c33ba805a1fef052f47a292]
# to [1a5f4ceaa263a33d8d30eda388b0f01363c7676f]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [f87b668c5dc754048758ef15a98e30583eb4067b]
# to [ea3847c6b0e7010eb2a471918cdea3a7aa68f032]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [4747e0d84e923f3e2393759e6b97315cedfb9b8a]
# to [a0c7d07639a2581b3d3ac3d18b716e2ea54fecca]
#
# patch "packages/uicmoc/uicmoc-native_2.3.10.bb"
# from [3eb23cf0c505c798552d20494b420631903c6ab1]
# to [5f5ef578c72a6f1a4350fd30b2b73d049ce313c6]
#
============================================================
--- packages/atk/atk_1.19.3.bb 656b768718fa0fb3c29376f5b6d2cecb01f2f4c1
+++ packages/atk/atk_1.19.3.bb 656b768718fa0fb3c29376f5b6d2cecb01f2f4c1
@@ -0,0 +1,10 @@
+require atk.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-${PV}.tar.bz2"
+
+do_stage () {
+ oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+ autotools_stage_includes
+}
============================================================
--- packages/opie-multikey/files/fix-rpath.patch c1275cf0c3e1eac9898ee5c1bb9b3ff0ba0f0486
+++ packages/opie-multikey/files/fix-rpath.patch c1275cf0c3e1eac9898ee5c1bb9b3ff0ba0f0486
@@ -0,0 +1,11 @@
+--- multikey/multikey.pro.org 2005-06-16 01:54:51.000000000 +0300
++++ multikey/multikey.pro 2007-07-04 21:02:52.000000000 +0300
+@@ -11,7 +11,7 @@
+ INCLUDEPATH += $(OPIEDIR)/include
+ DEPENDPATH += ../../launcher
+ LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopiecore2 -lopieui2
+-QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
++QMAKE_LFLAGS += -Wl,-rpath,$(palmtopdir)/plugins/inputmethods
+ VERSION = 1.0.0
+
+ include( $(OPIEDIR)/include.pro )
============================================================
--- packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch 3149f72c0600716f90b9ece4df7300b28f3c5dee
+++ packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch 3149f72c0600716f90b9ece4df7300b28f3c5dee
@@ -0,0 +1,35 @@
+--- launcher/taskbar.h.org 2004-08-23 00:35:22.000000000 +0300
++++ launcher/taskbar.h 2007-07-04 19:23:54.000000000 +0300
+@@ -84,6 +84,7 @@
+ LockKeyState* lockState;
+ StartMenu *sm;
+ bool resizeRunningApp;
++ bool showKbdLockState;
+ };
+
+
+--- launcher/taskbar.cpp.org 2005-07-04 01:13:00.000000000 +0300
++++ launcher/taskbar.cpp 2007-07-04 19:24:48.000000000 +0300
+@@ -213,12 +213,9 @@
+ (void)new SafeMode( this );
+ #endif
+
+- // ## make customizable in some way?
+-#ifdef OPIE_TASKBAR_LOCK_KEY_STATE
+- lockState = new LockKeyState( this );
+-#else
+ lockState = 0;
+-#endif
++ if ( showKbdLockState )
++ lockState = new LockKeyState( this );
+
+ #if defined(Q_WS_QWS)
+ #if !defined(QT_NO_COP)
+@@ -388,6 +385,7 @@
+ Config cfg( "Launcher" );
+ cfg.setGroup( "InputMethods" );
+ resizeRunningApp = cfg.readBoolEntry( "Resize", true );
++ showKbdLockState = cfg.readBoolEntry( "ShowKbdLocks", true );
+ }
+
+ #include "taskbar.moc"
============================================================
--- packages/uclibc/files/errno_values.h.patch 449baeeb6e48f88f75f07d09cdee9bd3ffcba48e
+++ packages/uclibc/files/errno_values.h.patch 449baeeb6e48f88f75f07d09cdee9bd3ffcba48e
@@ -0,0 +1,21 @@
+Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h
+===================================================================
+--- uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2002-08-23 20:48:19.000000000 +0200
++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2007-07-01 22:11:53.000000000 +0200
+@@ -134,4 +134,16 @@
+ #define ENOMEDIUM 123 /* No medium found */
+ #define EMEDIUMTYPE 124 /* Wrong medium type */
+
++/* the following errornumbers are only in 2.6 */
++
++#define ECANCELED 125 /* Operation Canceled */
++#define ENOKEY 126 /* Required key not available */
++#define EKEYEXPIRED 127 /* Key has expired */
++#define EKEYREVOKED 128 /* Key has been revoked */
++#define EKEYREJECTED 129 /* Key was rejected by service */
++
++/* for robust mutexes */
++#define EOWNERDEAD 130 /* Owner died */
++#define ENOTRECOVERABLE 131 /* State not recoverable */
++
+ #endif /* _BITS_ERRNO_VALUES_H */
============================================================
--- packages/uclibc/files/termios.h.patch a49212a1ef49d0a938f6687ab867600f05b3f1a4
+++ packages/uclibc/files/termios.h.patch a49212a1ef49d0a938f6687ab867600f05b3f1a4
@@ -0,0 +1,22 @@
+Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h
+===================================================================
+--- uClibc-0.9.29.orig/libc/sysdeps/linux/common/bits/termios.h 2006-02-13 09:41:37.000000000 +0100
++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h 2007-07-03 00:41:27.000000000 +0200
+@@ -156,7 +156,6 @@
+ #endif
+ #define B57600 0010001
+ #define B115200 0010002
+-#if 0 /* limited on uClibc, keep in sync w/ cfsetspeed.c */
+ #define B230400 0010003
+ #define B460800 0010004
+ #define B500000 0010005
+@@ -171,9 +170,6 @@
+ #define B3500000 0010016
+ #define B4000000 0010017
+ #define __MAX_BAUD B4000000
+-#else
+-#define __MAX_BAUD B115200
+-#endif
+ #ifdef __USE_MISC
+ # define CIBAUD 002003600000 /* input baud rate (not used) */
+ # define CMSPAR 010000000000 /* mark or space (stick) parity */
============================================================
--- packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch 80a6d114216133cf5b84be77d9090ced7721b591
+++ packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch 80a6d114216133cf5b84be77d9090ced7721b591
@@ -0,0 +1,20 @@
+diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
+index c2e7d9b..8d39585 100644
+--- a/src/kernel/qpixmapcache.cpp
++++ b/src/kernel/qpixmapcache.cpp
+@@ -123,9 +123,13 @@ void cleanup_pixmap_cache();
+ #ifdef THROW_AWAY_UNUSED_PAGES
+ # include <sys/mman.h> // madvise
+ # include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN
++# include <unistd.h> // getpagesize()
++# if (!defined(PAGE_ALIGN)) && defined(PAGE_SIZE) && defined(PAGE_MASK)
++# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
++# endif
+ # ifndef PAGE_ALIGN
+-# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+-# endif // PAGE_ALIGN
++# define PAGE_ALIGN(addr) (((addr)+getpagesize()-1)&~(getpagesize()-1))
++# endif
+ #endif // THROW_AWAY_UNUSED_PAGES
+
+
============================================================
--- classes/opie.bbclass 2653571d91e93ff5043997740e80656344ad35d8
+++ classes/opie.bbclass 441638d80c7d1595e6037940f20b24b8bca48ebd
@@ -80,6 +80,7 @@ python opie_do_opie_install() {
D = "%s/image" % bb.data.getVar( "WORKDIR", d, True )
WORKDIR = bb.data.getVar( "WORKDIR", d, True )
palmtopdir = bb.data.getVar( "palmtopdir", d, True )
+ gnubindir = bb.data.getVar( "bindir", d, True )
APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir )
if desktopdir is not None:
@@ -89,11 +90,12 @@ python opie_do_opie_install() {
os.system( "install -d %s%s%s/" % ( D, palmtopdir, bindir ) )
if APPTYPE == "binary":
- os.system( "install -m 0755 %s/%s %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
+ os.system( "install -d %s%s/" % ( D, gnubindir ) )
+ os.system( "install -m 0755 %s/%s %s%s/" % ( S, APPNAME, D, gnubindir ) )
elif APPTYPE == "quicklaunch":
os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
- os.system( "install -d %s%s/bin/" % ( D, palmtopdir ) )
- os.system( "ln -sf %s/bin/quicklauncher %s%s/bin/%s" % ( palmtopdir, D, palmtopdir, APPNAME ) )
+ os.system( "install -d %s%s/" % ( D, gnubindir ) )
+ os.system( "ln -sf %s/quicklauncher %s%s/%s" % ( gnubindir, D, gnubindir, APPNAME ) )
elif APPTYPE == "plugin":
os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
}
============================================================
--- classes/palmtop.bbclass 47dee0d1bcbc560241a59d1d1689a90ca8e37b3f
+++ classes/palmtop.bbclass 56d2e8dc703cfb39ea14ec0fc013546fcd6a20bb
@@ -19,8 +19,7 @@ PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${
QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
-FILES_${PN} = " ${palmtopdir} "
-FILES_${PN}-dev += " ${palmtopdir}/lib/lib*.so "
+FILES_${PN} += " ${palmtopdir} "
FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \
${palmtopdir}/bin/.debug \
${palmtopdir}/plugins/*/.debug "
============================================================
--- classes/sanity.bbclass cebf5a2ee9519f8342891e74db6ab2aaa370b992
+++ classes/sanity.bbclass dcb94eb7036e5db9888430963dfbead08880632d
@@ -49,6 +49,9 @@ def check_sanity(e):
print "Foo %s" % minversion
return
+ if 0 == os.getuid():
+ raise_sanity_error("Do not use Bitbake as root.")
+
messages = ""
if (LooseVersion(__version__) < LooseVersion(minversion)):
============================================================
--- classes/sdk.bbclass f5a6cb53cd1f28070b6b61af23f5004767157e55
+++ classes/sdk.bbclass 100957b869cd48dd7933ace807f396c946442a32
@@ -26,3 +26,23 @@ FILES_${PN}-dbg += "${prefix}/bin/.debug
FILES_${PN}-dbg += "${prefix}/bin/.debug \
${prefix}/sbin/.debug \
"
+
+sdk_ipk_do_indexes () {
+ set -x
+
+ ipkgarchs="${PACKAGE_ARCHS}"
+
+ if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
+ touch ${DEPLOY_DIR_IPK}/Packages
+ ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+ fi
+
+ for arch in $ipkgarchs; do
+ if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
+ if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ ] ; then
+ touch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages
+ ipkg-make-index -r ${DEPLOY_DIR_IPK}/${BU%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list