From 2b4d8829a8df88c2c5d78750536f12dd42ee6f57 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 18 Oct 2008 11:04:49 +0200 Subject: angstrom feed builder: add gnome-icon-theme to cleaning list --- contrib/angstrom/build-feeds.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index deea7d3627..75b630b22d 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -61,7 +61,7 @@ do_build for machine in simpad om-gta01 c7x0 nokia800 beagleboard dht-walnut efika do BUILD_MACHINE=$machine - BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python gnome-icon-theme" BUILD_TARGETS=" \ abiword \ aircrack-ng \ -- cgit v1.2.3 From 77129c893941ccffaf671fe14f217966b6802f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Sat, 18 Oct 2008 11:20:52 +0200 Subject: wt: fix cross-compilation --- packages/wt/files/cmakelist.patch | 18 ++++++++++++++++++ packages/wt/wt_2.2.0.bb | 6 +++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/wt/files/cmakelist.patch b/packages/wt/files/cmakelist.patch index 405914a4ed..9e1eab1835 100644 --- a/packages/wt/files/cmakelist.patch +++ b/packages/wt/files/cmakelist.patch @@ -1,3 +1,21 @@ +diff -urN wt-2.2.0.orig/src/CMakeLists.txt wt-2.2.0/src/CMakeLists.txt +--- wt-2.2.0.orig/src/CMakeLists.txt 2008-09-10 15:58:34.000000000 +0200 ++++ wt-2.2.0/src/CMakeLists.txt 2008-10-18 11:12:20.000000000 +0200 +@@ -33,8 +33,12 @@ + + LINK_DIRECTORIES(${BOOST_LIB_DIRS}) + +-ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C) +-GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION) ++IF(CMAKE_CROSSCOMPILING) ++ ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C) ++ GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION) ++ELSE(CMAKE_CROSSCOMPILING) ++ SET(FILE_TO_STRING_EXE ${CMAKE_CURRENT_SOURCE_DIR}/filetostring) ++ENDIF(CMAKE_CROSSCOMPILING) + + MACRO (FILE_TO_STRING infile outfile var) + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${outfile} diff -urN wt-2.2.0.orig/src/Wt/Ext/CMakeLists.txt wt-2.2.0/src/Wt/Ext/CMakeLists.txt --- wt-2.2.0.orig/src/Wt/Ext/CMakeLists.txt 2008-07-15 08:25:54.000000000 +0200 +++ wt-2.2.0/src/Wt/Ext/CMakeLists.txt 2008-10-17 22:37:38.000000000 +0200 diff --git a/packages/wt/wt_2.2.0.bb b/packages/wt/wt_2.2.0.bb index 4bd1f37eb7..16d8c55d2e 100644 --- a/packages/wt/wt_2.2.0.bb +++ b/packages/wt/wt_2.2.0.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" SECTION = "devel" LICENSE = "GPL" DEPENDS = "boost" -FILE_PR = "r1" +FILE_PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \ file://cmakelist.patch;patch=1" @@ -15,6 +15,10 @@ inherit cmake STAGE_TEMP = "${WORKDIR}/temp-staging" +do_configure_append() { + ${BUILD_CXX} ${BUILD_CXXFLAGS} -o src/filetostring src/web/skeleton/FileToString.C +} + do_stage() { rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} -- cgit v1.2.3 From fa469a73af202ce5ce3abc18070e82cc63183658 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 18 Oct 2008 12:49:32 +0200 Subject: libtelepathy: add telepathy-glib to DEPENDS --- packages/telepathy/libtelepathy_0.3.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/telepathy/libtelepathy_0.3.3.bb b/packages/telepathy/libtelepathy_0.3.3.bb index fdd310366c..23d7fc9cdf 100644 --- a/packages/telepathy/libtelepathy_0.3.3.bb +++ b/packages/telepathy/libtelepathy_0.3.3.bb @@ -1,5 +1,5 @@ HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -DEPENDS = "glib-2.0 dbus" +DEPENDS = "telepathy-glib glib-2.0 dbus" LICENSE = "LGPL" FILE_PR = "r0" -- cgit v1.2.3 From 23c6142305c9c2da6de029598706c88e2e320916 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 17 Oct 2008 15:45:39 +0200 Subject: task-x11[-illume]: switch to FILE_PR --- packages/tasks/task-x11-illume.bb | 2 +- packages/tasks/task-x11.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tasks/task-x11-illume.bb b/packages/tasks/task-x11-illume.bb index a477c6e8c5..b84efec516 100644 --- a/packages/tasks/task-x11-illume.bb +++ b/packages/tasks/task-x11-illume.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Illume Windowing Environment -- install this task to get the SECTION = "x11/wm" LICENSE = "MIT" PV = "1.0" -PR = "r0" +FILE_PR = "r0" # WORK IN PROGRESS diff --git a/packages/tasks/task-x11.bb b/packages/tasks/task-x11.bb index ad5ca3a412..ce1fa79bba 100644 --- a/packages/tasks/task-x11.bb +++ b/packages/tasks/task-x11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b SECTION = "x11/server" LICENSE = "MIT" PV = "1.0" -PR = "r0" +FILE_PR = "r0" # WORK IN PROGRESS -- cgit v1.2.3 From 0592d2c50f7b37411869bfad4d67e42f0186c3db Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 17 Oct 2008 16:57:28 +0200 Subject: taks-fso-compliance: add --- packages/tasks/task-fso-compliance.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/tasks/task-fso-compliance.bb diff --git a/packages/tasks/task-fso-compliance.bb b/packages/tasks/task-fso-compliance.bb new file mode 100644 index 0000000000..c331d7a8d0 --- /dev/null +++ b/packages/tasks/task-fso-compliance.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "The freesmartphone.org framework -- install this task to make your distribution FSO-compliant." +SECTION = "fso/base" +LICENSE = "MIT" +PV = "1.0" +FILE_PR = "r0" + +inherit task + +RDEPENDS_${PN} = "\ + frameworkd \ + fso-gpsd \ +" + +RRECOMMENDS_${PN} = "\ + gsm0710muxd \ +" -- cgit v1.2.3 From 58774ccd9fd50634d01536d81afe24b2571dfa7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Sat, 18 Oct 2008 14:28:23 +0200 Subject: boost-1.36.0: disable boost-serialization, it fails on powerpc --- packages/boost/boost-36.inc | 22 ++++++++++------------ packages/boost/boost_1.36.0.bb | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/boost/boost-36.inc b/packages/boost/boost-36.inc index 62dc504b84..3ccb66f4b6 100644 --- a/packages/boost/boost-36.inc +++ b/packages/boost/boost-36.inc @@ -22,16 +22,24 @@ BOOST_LIBS = "\ iostreams \ program_options \ regex \ - serialization \ signals \ system \ test \ thread \ " +# FIXME: for some reason this fails on powerpc +#BOOST_LIBS += "serialization" + +# To enable python, uncomment the following: +#BOOST_LIBS += "python" +#DEPENDS += "python" +#PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}" +#PYTHON_VERSION = "2.5" + S = "${WORKDIR}/${BOOST_P}" -# Make a package for each library, plus -dev and -python +# Make a package for each library, plus -dev PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" python __anonymous () { import bb @@ -54,16 +62,6 @@ FILES_boost-serialization = "${libdir}/libboost_serialization*.so* \ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so \ ${libdir}/libboost_unit_test_framework*.so*" -# Python - remove this and set: -#PYTHON_ROOT = "/dev/null" -# to remove the python build -DEPENDS += "python" -PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}" -PYTHON_VERSION = "2.5" - -PACKAGES += "boost-python" -FILES_boost-python = "${libdir}/libboost_python*.so*" - # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev" FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" diff --git a/packages/boost/boost_1.36.0.bb b/packages/boost/boost_1.36.0.bb index fdc3136ac4..17fddb06b4 100644 --- a/packages/boost/boost_1.36.0.bb +++ b/packages/boost/boost_1.36.0.bb @@ -2,7 +2,7 @@ include boost-36.inc DEFAULT_PREFERENCE = "-1" -FILE_PR = "r2" +FILE_PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ file://arm-intrinsics.patch;patch=1 \ -- cgit v1.2.3 From 4b1aa6a6145ce697754209480d6266369becac6d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Oct 2008 09:46:02 -0300 Subject: base.bbclass: strip branch name in base_detect_branch --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 8ff2346a34..b50bc8667c 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -773,7 +773,7 @@ def base_detect_branch(d): for scm in scms: rev = scm(d) if rev <> "": - return rev + return rev.strip() return "" -- cgit v1.2.3 From d1a7beac4aab0db73c2817402c44945752d3cdfb Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Oct 2008 09:48:04 -0300 Subject: checksums.ini: add xfce-utils 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 9b2da0c698..8bf9d77639 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16562,6 +16562,10 @@ sha256=67091b02a85c9700d574416c4adfca6db042b679ac3234228967f4a6c560ad93 md5=de6502dd93176b2a60e2e66bf052024f sha256=a40832c874dda5a06c0208cd178a8d02cd61cb2379aa46cdffbe3fb592fd551c +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce-utils-4.4.2.tar.bz2] +md5=119dd3f1daedfa41e3be89bad8997336 +sha256=eba910fb99598e09fa4c41c4ab405216a2b59a837a3ab058656360ec2324314c + [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-appfinder-4.2.2.tar.gz] md5=0ef8c944e8aa2db06719e02b2c40d70c sha256=4bca692e0af03c0f70c6cf62f2b60274e71899beaa45815c2d0f46f7f19c06d5 -- cgit v1.2.3 From 7da643e378c6f29d392f6b3f89d9792f6e56738c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Oct 2008 09:49:01 -0300 Subject: checksums.ini: add xfwm4 4.4.2 --- conf/checksums.ini | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/conf/checksums.ini b/conf/checksums.ini index 8bf9d77639..ae4f73b1c1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16542,10 +16542,6 @@ sha256=951cb843f1c98fb68e0ab71f260dda9bc77ffd7b3aa16883d22e395134125c48 md5=876a4b5d582de8fdc01457df2e7e1339 sha256=65531403c4b24f1be031e57a935b9a464661c47764cb913888aa86ed03ecb268 -[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-mcs-plugins-4.2.2.tar.gz] -md5=6e23972a2a0b3b3e7852bfc68dc0eeb8 -sha256=693166e49eac35a85e66a7ad5dee046657f08937dc0a9144ecd26148ab9917a9 - [http://www.us.xfce.org/archive/xfce-4.2.3/src/xfce-mcs-plugins-4.2.3.tar.gz] md5=cdd1ca3ff7610a45658aa801b91da8dc sha256=57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169 @@ -16554,6 +16550,10 @@ sha256=57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169 md5=6234425227e1145319bd75ef52fa97f5 sha256=f2773a4c007139f0a06c418b3535374ebeed8e10eef41d3ae69f4259f6f632a5 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2] +md5=77fcc929058de530d4f91eb25de851a1 +sha256=e16610264256248bfd8ca227c7861000abf0c323611ad34913b06c41af0c9be5 + [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-utils-4.2.2.tar.gz] md5=585e1fd48dee70c50271ac478e8adcd0 sha256=67091b02a85c9700d574416c4adfca6db042b679ac3234228967f4a6c560ad93 @@ -16702,6 +16702,10 @@ sha256=018628d7c5ef10d947cb0228ca4ed7527aebf9ea54eb6db49091a7b8f61c2b86 md5=3186d90ae752cce9687698c8bd6b26c3 sha256=3600267ba477217f065628454bffb30d8819731940c7fdbfd197c731bca9125f +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfwm4-4.4.2.tar.bz2] +md5=21da77e50b07e72bba784bf3418ca067 +sha256=710120122bc4acaaecdb0646656c5aa92f1d44c4c81d1a6775688abab04cca0a + [http://www.us.xfce.org/archive/xfce-4.2.0/src/xfwm4-themes-4.2.0.tar.gz] md5=a8d0676fbf9cd3b3514d76a39d4ecbe1 sha256=9aebac55dfc92a3533678a873d0f3babee285061b0ad5b26a56b6e72fb306ed4 @@ -17541,4 +17545,3 @@ sha256=12f5b654f6b91953391d2492a09d2c9586d5b7af419f0eeb306e1d30245659d3 [http://downloads.sourceforge.net/zziplib/zziplib-0.10.82.tar.bz2] md5=a6538f6c44ceeed0ed7e8e356f444168 sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8 - -- cgit v1.2.3 From 5886b2b45e2c7b2e26b646fb74d15c661c4664bd Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Oct 2008 09:50:43 -0300 Subject: checksums.ini: add xfce-mcs-plugins 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index ae4f73b1c1..5bbcd46816 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16542,6 +16542,10 @@ sha256=951cb843f1c98fb68e0ab71f260dda9bc77ffd7b3aa16883d22e395134125c48 md5=876a4b5d582de8fdc01457df2e7e1339 sha256=65531403c4b24f1be031e57a935b9a464661c47764cb913888aa86ed03ecb268 +[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-mcs-plugins-4.2.2.tar.gz] +md5=6e23972a2a0b3b3e7852bfc68dc0eeb8 +sha256=693166e49eac35a85e66a7ad5dee046657f08937dc0a9144ecd26148ab9917a9 + [http://www.us.xfce.org/archive/xfce-4.2.3/src/xfce-mcs-plugins-4.2.3.tar.gz] md5=cdd1ca3ff7610a45658aa801b91da8dc sha256=57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169 -- cgit v1.2.3 From 8b78fa6cc5cfea3cccf237a9b6d558d8cff56321 Mon Sep 17 00:00:00 2001 From: woglinde Date: Fri, 17 Oct 2008 19:32:38 +0200 Subject: uclibc.inc: do not install ldconfig and ldd to staging * do not install this target binaries to install they are not useful and were installed into a false directory * bump PR on all affected recipes --- packages/uclibc/bfin-uclibc_svn.bb | 2 +- packages/uclibc/uclibc.inc | 5 ----- packages/uclibc/uclibc_0.9.26.bb | 2 +- packages/uclibc/uclibc_0.9.27.bb | 2 +- packages/uclibc/uclibc_0.9.28.bb | 2 +- packages/uclibc/uclibc_0.9.29.bb | 2 +- packages/uclibc/uclibc_nptl.bb | 2 +- packages/uclibc/uclibc_svn.bb | 2 +- 8 files changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/uclibc/bfin-uclibc_svn.bb b/packages/uclibc/bfin-uclibc_svn.bb index f05a2deb37..891ff87328 100644 --- a/packages/uclibc/bfin-uclibc_svn.bb +++ b/packages/uclibc/bfin-uclibc_svn.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -FILE_PR = "r3" +FILE_PR = "r4" PV = "${UCLIBC_BASE}+svnr${SRCREV}" require uclibc.inc diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index f20caa29f1..9b27e1f323 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -155,11 +155,6 @@ do_stage() { RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ install_dev install_runtime - # Install into the staging dir - oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - install_utils - # We don't really need this rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb index ee741a893c..f4b7aa3c28 100644 --- a/packages/uclibc/uclibc_0.9.26.bb +++ b/packages/uclibc/uclibc_0.9.26.bb @@ -1,4 +1,4 @@ -FILE_PR = "r11" +FILE_PR = "r12" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb index 367964a2e1..049017b2fb 100644 --- a/packages/uclibc/uclibc_0.9.27.bb +++ b/packages/uclibc/uclibc_0.9.27.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -FILE_PR = "r11" +FILE_PR = "r12" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb index d4c3b174ee..9b6c342080 100644 --- a/packages/uclibc/uclibc_0.9.28.bb +++ b/packages/uclibc/uclibc_0.9.28.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -FILE_PR = "r16" +FILE_PR = "r17" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index bd350dd144..7d659160f4 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -FILE_PR = "r28" +FILE_PR = "r29" DEFAULT_PREFERENCE = "1" require uclibc.inc diff --git a/packages/uclibc/uclibc_nptl.bb b/packages/uclibc/uclibc_nptl.bb index c1506bc7b6..b441cb821f 100644 --- a/packages/uclibc/uclibc_nptl.bb +++ b/packages/uclibc/uclibc_nptl.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -FILE_PR = "r2" +FILE_PR = "r3" #DEFAULT_PREFERENCE = "2" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index ee30f20396..d643b43769 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -FILE_PR = "r16" +FILE_PR = "r17" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. -- cgit v1.2.3 From 5443f24a5262480572d01425754b65faf36bac10 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 18 Oct 2008 08:30:37 -0500 Subject: SlugOS: slugos-packages - demote gdb due to build failure --- packages/meta/slugos-packages.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index c69e20d679..740677eddb 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -FILE_PR = "r58" +FILE_PR = "r59" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -92,7 +92,6 @@ SLUGOS_PACKAGES = "\ fuse \ gawk \ gcc \ - gdb \ gdbm \ glib-2.0 \ gnu-config \ @@ -255,6 +254,7 @@ SLUGOS_BROKEN_PACKAGES = "\ ctorrent \ dsniff \ eciadsl \ + gdb \ gspcav1 \ linphone \ lirc-modules lirc \ -- cgit v1.2.3 From e769c7fbe16294b2c5306edfafa1ec821b7b138c Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sat, 18 Oct 2008 16:31:30 +0200 Subject: frameworkd git: ship yaml rules in -config package and tag them as CONFFILE --- packages/freesmartphone/frameworkd_git.bb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 3ad398b5e7..2fd8a480fd 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -4,7 +4,7 @@ AUTHOR = "Michael 'Mickey' Lauer et. al." SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -PV = "0.8.4.0+gitr${SRCREV}" +PV = "0.8.4.2+gitr${SRCREV}" FILE_PR = "r0" inherit distutils update-rc.d @@ -35,6 +35,7 @@ RDEPENDS_${PN} += "\ python-shell \ python-subprocess \ python-syslog \ + python-textutils \ \ ${PN}-config \ " @@ -49,10 +50,21 @@ RRECOMMENDS_${PN}_append_om-gta01 = "gsm0710muxd" RRECOMMENDS_${PN}_append_om-gta02 = "gsm0710muxd" PACKAGES =+ "${PN}-config" - PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}" -FILES_${PN}-config = "${sysconfdir}/frameworkd.conf" -CONFFILES_${PN}-config = "${sysconfdir}/frameworkd.conf" + +FILES_${PN}-config = "\ + ${sysconfdir}/frameworkd.conf \ + ${sysconfdir}/freesmartphone \ +" +CONFFILES_${PN}-config = "\ + ${sysconfdir}/frameworkd.conf \ + ${sysconfdir}/freesmartphone/opreferences/conf/phone/silent.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/phone/default.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/profiles/default.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/rules/silent.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/rules/default.yaml \ + ${sysconfdir}/freesmartphone/oevents/rules.yaml \ +" PACKAGE_ARCH_${PN} = "${BASE_PACKAGE_ARCH}" FILES_${PN} += "${sysconfdir}/dbus-1 ${sysconfdir}/freesmartphone ${sysconfdir}/init.d ${datadir}" -- cgit v1.2.3