[oe-commits] org.oe.dev merge of '55373d0f032518e68dd4f39df8983ede9ea7659b'

pfalcon commit openembedded-commits at lists.openembedded.org
Wed Feb 6 16:13:47 UTC 2008


merge of '55373d0f032518e68dd4f39df8983ede9ea7659b'
     and 'a7d8d33ac7c9103154c98fde0a758a23c99ed439'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 04d71b254a1cb165a6dab2688fc19c937e10afc5
ViewMTN: http://monotone.openembedded.org/revision/info/04d71b254a1cb165a6dab2688fc19c937e10afc5
Files:
1
packages/initrdscripts/files/90-check-modules.sh
packages/initrdscripts/initramfs-module-check-modules_1.0.bb
packages/images/initramfs-bootmenu-image.bb
packages/libglade/libglade-2.0.1
packages/libglade/libglade-2.0.1/glade-cruft.patch
packages/libglade/libglade-2.4.0
packages/libglade/libglade-2.4.0/glade-cruft.patch
packages/libglade/libglade-2.4.0/no-xml2.patch
packages/libglade/libglade-2.4.2
packages/libglade/libglade-2.4.2/glade-cruft.patch
packages/libglade/libglade-2.4.2/no-xml2.patch
packages/libglade/libglade-2.5.1
packages/libglade/libglade-2.5.1/glade-cruft.patch
packages/libglade/libglade-2.5.1/no-xml2.patch
packages/libeventdb/libeventdb_0.90.bb
packages/libeventdb/libeventdb.inc
packages/libglade/libglade-2.0.1/gtk-2.0.m4
packages/libglade/files/gtk-2.0.m4
packages/libglade/libglade-2.5.1/no-deprecation.patch
packages/libglade/files/no-deprecation.patch
packages/libglade/libglade-2.6.2
packages/libglade/files
packages/libglade/libglade_2.6.2.bb
packages/libglade/libglade.inc
packages/kismet/kismet.inc
conf/distro/include/angstrom-glibc.inc
packages/kismet/kismet-newcore_svn.bb
packages/kismet/kismet_2007-01-R1b.bb
packages/kismet/kismet_2007-10-R1.bb
packages/kismet/kismet_svn.bb
packages/libeventdb/libeventdb_0.17.bb
packages/libeventdb/libeventdb_0.18.bb
packages/libeventdb/libeventdb_0.19.bb
packages/libeventdb/libeventdb_0.21.bb
packages/libeventdb/libeventdb_0.30.bb
packages/libeventdb/libeventdb_svn.bb
packages/libglade/libglade_2.0.1.bb
packages/libglade/libglade_2.4.0.bb
packages/libglade/libglade_2.4.2.bb
packages/libglade/libglade_2.5.1.bb
Diffs:

#
# mt diff -r55373d0f032518e68dd4f39df8983ede9ea7659b -r04d71b254a1cb165a6dab2688fc19c937e10afc5
#
# 
# 
# add_file "packages/initrdscripts/files/90-check-modules.sh"
#  content [e60f755f3b8a6d72a799b68ff1a7291714bce727]
# 
# add_file "packages/initrdscripts/initramfs-module-check-modules_1.0.bb"
#  content [fbcef5b65fba763e3f80cb8690e058b469db5f03]
# 
# patch "packages/images/initramfs-bootmenu-image.bb"
#  from [8f1db3a032593d55326052d8031210f27d4194a9]
#    to [c4a6c99f3e90e1c33c4101d8d843f89b6ea05dc8]
# 
============================================================
--- packages/initrdscripts/files/90-check-modules.sh	e60f755f3b8a6d72a799b68ff1a7291714bce727
+++ packages/initrdscripts/files/90-check-modules.sh	e60f755f3b8a6d72a799b68ff1a7291714bce727
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Check that modules for the current kernel exist, error out otherwise
+
+uname=`cat /proc/version`
+ver=`expr "x$uname" : 'xLinux version \([^ ]\+\) '`
+
+if [ -n "$BOOT_ROOT" -a ! -d "$BOOT_ROOT/lib/modules/$ver" ]; then
+    echo -e "\033[1m===================="
+    echo "ERROR!"
+    echo "There are no modules for this kernel"
+    echo "version ($ver) in the root file "
+    echo "system, which will lead to boot failure or"
+    echo "broken functionally. If you performed"
+    echo "a kernel upgrade, make sure that version"
+    echo "installed in root filesystem matches"
+    echo "version used in bootloader."
+    echo -e "====================\033[0m"
+    echo
+
+    echo "System halted"
+    while true; do
+	sleep 10000
+    done
+fi
============================================================
--- packages/initrdscripts/initramfs-module-check-modules_1.0.bb	fbcef5b65fba763e3f80cb8690e058b469db5f03
+++ packages/initrdscripts/initramfs-module-check-modules_1.0.bb	fbcef5b65fba763e3f80cb8690e058b469db5f03
@@ -0,0 +1,12 @@
+SRC_URI = "file://90-check-modules.sh"
+PR = "r0"
+DESCRIPTION = "An initramfs module for checking that kernel modules exist in rootfs"
+RDEPENDS = "initramfs-uniboot"
+
+do_install() {
+	install -d ${D}/initrd.d
+        install -m 0755 ${WORKDIR}/90-check-modules.sh ${D}/initrd.d/
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += " /initrd.d/* "
============================================================
--- packages/images/initramfs-bootmenu-image.bb	8f1db3a032593d55326052d8031210f27d4194a9
+++ packages/images/initramfs-bootmenu-image.bb	c4a6c99f3e90e1c33c4101d8d843f89b6ea05dc8
@@ -1,6 +1,6 @@
 # Sample initramfs image
 
-IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu"
+IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu initramfs-module-check-modules"
 IMAGE_LINGUAS = ""
 
 # Remove any kernel-image that the kernel-module-* packages may have pulled in.


#
# mt diff -ra7d8d33ac7c9103154c98fde0a758a23c99ed439 -r04d71b254a1cb165a6dab2688fc19c937e10afc5
#
# 
# 
# delete "packages/libglade/libglade-2.0.1"
# 
# delete "packages/libglade/libglade-2.0.1/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.4.0"
# 
# delete "packages/libglade/libglade-2.4.0/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.4.0/no-xml2.patch"
# 
# delete "packages/libglade/libglade-2.4.2"
# 
# delete "packages/libglade/libglade-2.4.2/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.4.2/no-xml2.patch"
# 
# delete "packages/libglade/libglade-2.5.1"
# 
# delete "packages/libglade/libglade-2.5.1/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.5.1/no-xml2.patch"
# 
# rename "packages/libeventdb/libeventdb_0.90.bb"
#     to "packages/libeventdb/libeventdb.inc"
# 
# rename "packages/libglade/libglade-2.0.1/gtk-2.0.m4"
#     to "packages/libglade/files/gtk-2.0.m4"
# 
# rename "packages/libglade/libglade-2.5.1/no-deprecation.patch"
#     to "packages/libglade/files/no-deprecation.patch"
# 
# rename "packages/libglade/libglade-2.6.2"
#     to "packages/libglade/files"
# 
# rename "packages/libglade/libglade_2.6.2.bb"
#     to "packages/libglade/libglade.inc"
# 
# add_file "packages/kismet/kismet.inc"
#  content [6d7f0ae5376d1127a682ca46b5c14143495885a1]
# 
# add_file "packages/libeventdb/libeventdb_0.90.bb"
#  content [f7cd7ccf69494c816675221c17c3899b3485ad74]
# 
# add_file "packages/libglade/libglade_2.6.2.bb"
#  content [260a55eda5df2583b5a81605299e62f43424f7c7]
# 
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [b16bd6ee43f9f951b39d8fac7fa1e4c463d709e3]
#    to [5298d319ab0e8646c489c50e6e754391aa2f16d7]
# 
# patch "packages/kismet/kismet-newcore_svn.bb"
#  from [613997394be7e86e20920124bb2c4b10ce09a6d6]
#    to [312f6dbfa409f99e4016d13495545a9846e66abc]
# 
# patch "packages/kismet/kismet_2007-01-R1b.bb"
#  from [7e83fb1593b2bd1fd42096c78c76fda8b806160c]
#    to [44c52fb61cc91d305df7c9f9ad5404b97f45f5c4]
# 
# patch "packages/kismet/kismet_2007-10-R1.bb"
#  from [b8971fcf7ccf5f139688680c6faccc7b2cfe9bff]
#    to [44c52fb61cc91d305df7c9f9ad5404b97f45f5c4]
# 
# patch "packages/kismet/kismet_svn.bb"
#  from [318ffe650be4c09ccb40afed1857af643d02a724]
#    to [a4c2a34319b0225d1132aa1120dfc35897253ead]
# 
# patch "packages/libeventdb/libeventdb.inc"
#  from [00bd0aa085967a7c614d37c15c639bb8dd8b0aea]
#    to [a989080bd8f6c5e9bead8f2aef1390e8f18eb364]
# 
# patch "packages/libeventdb/libeventdb_0.17.bb"
#  from [e4f740a1da36d08411746bd620766e9de47cf35e]
#    to [e77aba843d815849ce95a84393a37fa78a359bea]
# 
# patch "packages/libeventdb/libeventdb_0.18.bb"
#  from [6a43edb6d181d65868ea41557f63b1a92c5015ea]
#    to [f7cd7ccf69494c816675221c17c3899b3485ad74]
# 
# patch "packages/libeventdb/libeventdb_0.19.bb"
#  from [6582a9e961827dac38d33e493ed393631b60098c]
#    to [f7cd7ccf69494c816675221c17c3899b3485ad74]
# 
# patch "packages/libeventdb/libeventdb_0.21.bb"
#  from [6582a9e961827dac38d33e493ed393631b60098c]
#    to [f7cd7ccf69494c816675221c17c3899b3485ad74]
# 
# patch "packages/libeventdb/libeventdb_0.30.bb"
#  from [a915b3f9c63bec0af8eee4b072c3b770c2826452]
#    to [ec33b40bd80787f59bdfce33e4b898ec82fb755a]
# 
# patch "packages/libeventdb/libeventdb_svn.bb"
#  from [2664184e6630ade5d75ac8cc129d94d7b036f5f4]
#    to [8dd94097d1b481e31f78af12926e04181cf14cbd]
# 
# patch "packages/libglade/libglade.inc"
#  from [d94670ece5e8b9e8e3e0ba00b7744b565be182af]
#    to [436c12a98f08dbbdf23435a5f7427334a373b13b]
# 
# patch "packages/libglade/libglade_2.0.1.bb"
#  from [5b9997972462185f7650879d29314cf970269214]
#    to [4f7237e7991a74e49681d098a30a11727f4f6eda]
# 
# patch "packages/libglade/libglade_2.4.0.bb"
#  from [1522a52bfc4e1fd114cbcbdf0dcc668d5d2ae51d]
#    to [4e7c0d5e52113288c7c519a8b542e7638929bc46]
# 
# patch "packages/libglade/libglade_2.4.2.bb"
#  from [77537a247a98aa71ce5b3b06eb9ab78407ee23a3]
#    to [883f2c0f0b8d2ec182afa3f3cd1b08c0c0d80257]
# 
# patch "packages/libglade/libglade_2.5.1.bb"
#  from [ea9815d992df837e1c5913b615a6ea5130f2d9e5]
#    to [71f7284eedd6ea02babe87719f55b96727f9cb09]
# 
============================================================
--- packages/kismet/kismet.inc	6d7f0ae5376d1127a682ca46b5c14143495885a1
+++ packages/kismet/kismet.inc	6d7f0ae5376d1127a682ca46b5c14143495885a1
@@ -0,0 +1,33 @@
+DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+HOMEPAGE = "http://www.kismetwireless.net/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap"
+
+SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
+
+EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
+                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+
+inherit autotools
+
+fakeroot do_install() {
+     oe_runmake "DESTDIR=${D}" suidinstall
+}
+
+do_install_append() {
+	if test -e ${WORKDIR}/kismet.conf; then
+		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
+	fi
+}
+
+PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
+
+FILES_${PN}-sounds = "${datadir}/kismet/wav"
+RDEPENDS_${PN}-sounds = "sox"
+
+FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
+RDEPENDS_${PN}-gpsmap = "gpsd"
+
+CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
+
============================================================
--- packages/libeventdb/libeventdb_0.90.bb	f7cd7ccf69494c816675221c17c3899b3485ad74
+++ packages/libeventdb/libeventdb_0.90.bb	f7cd7ccf69494c816675221c17c3899b3485ad74
@@ -0,0 +1,3 @@
+require libeventdb.inc
+
+PR = "r1"
============================================================
--- packages/libglade/libglade_2.6.2.bb	260a55eda5df2583b5a81605299e62f43424f7c7
+++ packages/libglade/libglade_2.6.2.bb	260a55eda5df2583b5a81605299e62f43424f7c7
@@ -0,0 +1,11 @@
+require libglade.inc
+
+PR = "r2"
+
+inherit gnome
+
+SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
+
+EXTRA_OECONF += "--without-libxml2"
+
+LDFLAGS += "-lz"
============================================================
--- conf/distro/include/angstrom-glibc.inc	b16bd6ee43f9f951b39d8fac7fa1e4c463d709e3
+++ conf/distro/include/angstrom-glibc.inc	5298d319ab0e8646c489c50e6e754391aa2f16d7
@@ -1,8 +1,9 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREF
 # glibc:
 PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
 PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
 PREFERRED_PROVIDER_virtual/libc ?= "glibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
 
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
============================================================
--- packages/kismet/kismet-newcore_svn.bb	613997394be7e86e20920124bb2c4b10ce09a6d6
+++ packages/kismet/kismet-newcore_svn.bb	312f6dbfa409f99e4016d13495545a9846e66abc
@@ -1,28 +1,12 @@
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
-PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+require kismet.inc
+
 DEFAULT_PREFERENCE = "-1"
-SRC_URI = "svn://svn.kismetwireless.net/code/branch/;module=kismet-newcore;proto=http"
 
-EXTRA_OECONF = "--disable-gpsmap --enable-wsp100 --with-pcap=linux \
-                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+PV = "0.0+svnr${SRCREV}"
+PR = "r3"
 
-inherit autotools
+SRC_URI = "svn://svn.kismetwireless.net/code/branch/;module=kismet-newcore;proto=http"
 
-S = "${WORKDIR}/kismet-newcore"
+EXTRA_OECONF += "--disable-gpsmap"
 
+S = "${WORKDIR}/kismet-newcore"
-fakeroot do_install() {
-     oe_runmake "DESTDIR=${D}" suidinstall
-}
-
-PACKAGES =+ "${PN}-sounds"
-
-FILES_${PN}-sounds = "${datadir}/kismet/wav"
-RDEPENDS_${PN}-sounds = "sox"
-
-CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
-
============================================================
--- packages/kismet/kismet_2007-01-R1b.bb	7e83fb1593b2bd1fd42096c78c76fda8b806160c
+++ packages/kismet/kismet_2007-01-R1b.bb	44c52fb61cc91d305df7c9f9ad5404b97f45f5c4
@@ -1,34 +1,3 @@
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
-PR = "r2"
+require kismet.inc
 
+PR = "r3"
-SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
-
-EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
-                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
-
-inherit autotools
-
-fakeroot do_install() {
-     oe_runmake "DESTDIR=${D}" suidinstall
-}
-
-do_install_append() {
-	if test -e ${WORKDIR}/kismet.conf; then
-		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
-	fi
-}
-
-PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
-
-FILES_${PN}-sounds = "${datadir}/kismet/wav"
-RDEPENDS_${PN}-sounds = "sox"
-
-FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
-RDEPENDS_${PN}-gpsmap = "gpsd"
-
-CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
-
============================================================
--- packages/kismet/kismet_2007-10-R1.bb	b8971fcf7ccf5f139688680c6faccc7b2cfe9bff
+++ packages/kismet/kismet_2007-10-R1.bb	44c52fb61cc91d305df7c9f9ad5404b97f45f5c4
@@ -1,34 +1,3 @@
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap"
-PR = "r2"
+require kismet.inc
 
+PR = "r3"
-SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
-
-EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
-                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
-
-inherit autotools
-
-fakeroot do_install() {
-     oe_runmake "DESTDIR=${D}" suidinstall
-}
-
-do_install_append() {
-	if test -e ${WORKDIR}/kismet.conf; then
-		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
-	fi
-}
-
-PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
-
-FILES_${PN}-sounds = "${datadir}/kismet/wav"
-RDEPENDS_${PN}-sounds = "sox"
-
-FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
-RDEPENDS_${PN}-gpsmap = "gpsd"
-
-CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
-
============================================================
--- packages/kismet/kismet_svn.bb	318ffe650be4c09ccb40afed1857af643d02a724
+++ packages/kismet/kismet_svn.bb	a4c2a34319b0225d1132aa1120dfc35897253ead
@@ -1,37 +1,10 @@
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
-PV = "2007-10-R1+svnr${SRCREV}"
-PR = "r1"
+require kismet.inc
+
 DEFAULT_PREFERENCE = "-1"
-SRC_URI = "svn://svn.kismetwireless.net/code/;module=trunk;proto=http"
 
-EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
-                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+PV = "2007-10-R1+svnr${SRCREV}"
+PR = "r2"
 
-inherit autotools
+SRC_URI = "svn://svn.kismetwireless.net/code/;module=trunk;proto=http"
 
 S = "${WORKDIR}/trunk"
-
-fakeroot do_install() {
-     oe_runmake "DESTDIR=${D}" suidinstall
-}
-
-do_install_append() {
-	if test -e ${WORKDIR}/kismet.conf; then
-		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
-	fi
-}
-
-PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
-
-FILES_${PN}-sounds = "${datadir}/kismet/wav"
-RDEPENDS_${PN}-sounds = "sox"
-
-FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
-RDEPENDS_${PN}-gpsmap = "gpsd"
-
-CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
-
============================================================
--- packages/libeventdb/libeventdb_0.90.bb	00bd0aa085967a7c614d37c15c639bb8dd8b0aea
+++ packages/libeventdb/libeventdb.inc	a989080bd8f6c5e9bead8f2aef1390e8f18eb364
@@ -1,14 +1,13 @@
-LICENSE     = "LGPL"
 DESCRIPTION = "Database access library for GPE calendar"
 SECTION = "gpe/libs"
+LICENSE = "LGPL"
 PRIORITY = "optional"
-DEPENDS  = "libgpewidget libgpepimc sqlite"
+DEPENDS = "libgpewidget libgpepimc sqlite"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
 inherit pkgconfig gpe autotools
 
-
 do_stage () {
         autotools_stage_all
 }
============================================================
--- packages/libeventdb/libeventdb_0.17.bb	e4f740a1da36d08411746bd620766e9de47cf35e
+++ packages/libeventdb/libeventdb_0.17.bb	e77aba843d815849ce95a84393a37fa78a359bea
@@ -1,20 +1,5 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS = "libgpewidget libgpepimc sqlite"
+require libeventdb.inc
 
-GPE_TARBALL_SUFFIX = "bz2"
+PR = "r1"
 
-inherit pkgconfig gpe autotools
-
 headers = "event-db.h"
-
-do_stage () {
-	oe_libinstall -so libeventdb ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/gpe
-	for h in ${headers}; do
-		install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
-	done
-}
============================================================
--- packages/libeventdb/libeventdb_0.18.bb	6a43edb6d181d65868ea41557f63b1a92c5015ea
+++ packages/libeventdb/libeventdb_0.18.bb	f7cd7ccf69494c816675221c17c3899b3485ad74
@@ -1,14 +1,3 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS = "libgpewidget libgpepimc sqlite"
+require libeventdb.inc
 
+PR = "r1"
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit pkgconfig gpe autotools
-
-
-do_stage () {
-autotools_stage_all
-}
============================================================
--- packages/libeventdb/libeventdb_0.19.bb	6582a9e961827dac38d33e493ed393631b60098c
+++ packages/libeventdb/libeventdb_0.19.bb	f7cd7ccf69494c816675221c17c3899b3485ad74
@@ -1,14 +1,3 @@
-LICENSE     = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS  = "libgpewidget libgpepimc sqlite"
+require libeventdb.inc
 
+PR = "r1"
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit pkgconfig gpe autotools
-
-
-do_stage () {
-autotools_stage_all
-}
============================================================
--- packages/libeventdb/libeventdb_0.21.bb	6582a9e961827dac38d33e493ed393631b60098c
+++ packages/libeventdb/libeventdb_0.21.bb	f7cd7ccf69494c816675221c17c3899b3485ad74
@@ -1,14 +1,3 @@
-LICENSE     = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS  = "libgpewidget libgpepimc sqlite"
+require libeventdb.inc
 
+PR = "r1"
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit pkgconfig gpe autotools
-
-
-do_stage () {
-autotools_stage_all
-}
============================================================
--- packages/libeventdb/libeventdb_0.30.bb	a915b3f9c63bec0af8eee4b072c3b770c2826452
+++ packages/libeventdb/libeventdb_0.30.bb	ec33b40bd80787f59bdfce33e4b898ec82fb755a
@@ -1,16 +1,4 @@
-DEFAULT_PREFERENCE = "-1"
+require libeventdb.inc
 
+PR = "r1"
+DEFAULT_PREFERENCE = "-1"
-LICENSE     = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS  = "libgpewidget libgpepimc sqlite"
-
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit pkgconfig gpe autotools
-
-
-do_stage () {
-autotools_stage_all
-}
============================================================
--- packages/libeventdb/libeventdb_svn.bb	2664184e6630ade5d75ac8cc129d94d7b036f5f4
+++ packages/libeventdb/libeventdb_svn.bb	8dd94097d1b481e31f78af12926e04181cf14cbd
@@ -1,21 +1,8 @@
-DESCRIPTION = "Database access library for GPE calendar"
-LICENSE     = "LGPL"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
+require libeventdb.inc
 
-DEPENDS  = "libgpewidget libgpepimc sqlite"
-
+PR = "r1"
 PV = "0.90+svn${SRCDATE}"
-PR = "r0"
-
 DEFAULT_PREFERENCE = "-1"
 
-inherit pkgconfig gpe autotools
-
 SRC_URI = "${GPE_SVN}"
-
 S = "${WORKDIR}/${PN}"%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list