[oe-commits] org.oe.dev merge of '3096507e1176a6f381be085273c56ec4c8587ec8'
pfalcon commit
openembedded-commits at lists.openembedded.org
Wed Feb 6 16:48:53 UTC 2008
merge of '3096507e1176a6f381be085273c56ec4c8587ec8'
and 'a86b893a92c8dbd634262771afe20a8eb26f2b82'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: e3a17e2ff263cac6d4b035034dc79a0e05fc548d
ViewMTN: http://monotone.openembedded.org/revision/info/e3a17e2ff263cac6d4b035034dc79a0e05fc548d
Files:
1
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/postgresql/postgresql_8.2.4.bb
packages/postgresql/postgresql.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
packages/postgresql/postgresql_8.1.4.bb
packages/postgresql/postgresql_8.1.8.bb
contrib/image-convert
contrib/image-convert/README
contrib/image-convert/cpio2tar
contrib/image-convert/tar2ext2
contrib/image-convert/tar2ext2.mount
contrib/image-convert/tar2jffs
mtn:execute
true
Diffs:
#
# mt diff -r3096507e1176a6f381be085273c56ec4c8587ec8 -re3a17e2ff263cac6d4b035034dc79a0e05fc548d
#
#
#
# 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"
#
# rename "packages/postgresql/postgresql_8.2.4.bb"
# to "packages/postgresql/postgresql.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]
#
# add_file "packages/postgresql/postgresql_8.2.4.bb"
# content [41ca5b2fb5d019ac39217a5c0179b31e6f22ec24]
#
# 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]
#
# patch "packages/postgresql/postgresql.inc"
# from [969bc54ca34868f98644e9c9079ec2525cc08bbc]
# to [e37431b7065b95ed185a1fa0cc6c30c0d2898034]
#
# patch "packages/postgresql/postgresql_8.1.4.bb"
# from [98fe892b8cf4a6013e48a0e9e68aca394fbe2e47]
# to [deb1ab6389bb118cc689529caaaf09ec341b5fa2]
#
# patch "packages/postgresql/postgresql_8.1.8.bb"
# from [3457236ec656fc67c87d390af818ef6b2f5b9f75]
# to [deb1ab6389bb118cc689529caaaf09ec341b5fa2]
#
============================================================
--- 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"
============================================================
--- packages/postgresql/postgresql_8.2.4.bb 41ca5b2fb5d019ac39217a5c0179b31e6f22ec24
+++ packages/postgresql/postgresql_8.2.4.bb 41ca5b2fb5d019ac39217a5c0179b31e6f22ec24
@@ -0,0 +1,7 @@
+require postgresql.inc
+
+PR = "r1"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://ftp.de.postgresql.org/mirror/postgresql/source/v${PV}/${P}.tar.bz2 \
+ file://no-ecpg-test.patch;patch=1"
============================================================
--- 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%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -ra86b893a92c8dbd634262771afe20a8eb26f2b82 -re3a17e2ff263cac6d4b035034dc79a0e05fc548d
#
#
#
# add_dir "contrib/image-convert"
#
# add_file "contrib/image-convert/README"
# content [6a51a30551e511575545a5fd8f73323e24a5a25e]
#
# add_file "contrib/image-convert/cpio2tar"
# content [e07f0f5d36511dd5de463b7f681d718aa5a217a0]
#
# add_file "contrib/image-convert/tar2ext2"
# content [d85040f059d884124f04ced0190c90dd4f07e0aa]
#
# add_file "contrib/image-convert/tar2ext2.mount"
# content [f3a784276701f55e27d354d61098277d73ad6103]
#
# add_file "contrib/image-convert/tar2jffs"
# content [351ffdf2f7346259f133eeed2e6477c83e34d59a]
#
# set "contrib/image-convert/cpio2tar"
# attr "mtn:execute"
# value "true"
#
# set "contrib/image-convert/tar2ext2"
# attr "mtn:execute"
# value "true"
#
# set "contrib/image-convert/tar2ext2.mount"
# attr "mtn:execute"
# value "true"
#
# set "contrib/image-convert/tar2jffs"
# attr "mtn:execute"
# value "true"
#
============================================================
--- contrib/image-convert/README 6a51a30551e511575545a5fd8f73323e24a5a25e
+++ contrib/image-convert/README 6a51a30551e511575545a5fd8f73323e24a5a25e
@@ -0,0 +1,5 @@
+This directory contains scripts to convert (root) filesystem images from one
+format to another. While OpenEmbedded has extensive support for generating
+images in various formats, sometimes it may be useful/needed to convert
+already existing image.
+
============================================================
--- contrib/image-convert/cpio2tar e07f0f5d36511dd5de463b7f681d718aa5a217a0
+++ contrib/image-convert/cpio2tar e07f0f5d36511dd5de463b7f681d718aa5a217a0
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+STAGING= #~/linux-ppc/build-oe-angstrom/tmp/staging/i686-linux/bin/
+
+${STAGING}fakeroot bash -c " \
+rm -rf scratch; mkdir scratch; \
+cd scratch; gzip -d -c ../$1 | cpio -i --make-directories; \
+cd ..; \
+tar -cj -C scratch -f $(basename $1 .cpio.gz).tar.bz2 ."
============================================================
--- contrib/image-convert/tar2ext2 d85040f059d884124f04ced0190c90dd4f07e0aa
+++ contrib/image-convert/tar2ext2 d85040f059d884124f04ced0190c90dd4f07e0aa
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+if [ $# -ne 2 ]; then
+ echo "Usage: $0 <tarball> <ext2 size>"
+ exit
+fi
+
+ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'`
+base=$(basename $1 .$ext)
+dir=$(dirname $1)
+
+if [ "$ext" == "tar.bz2" ]; then
+ uncompress=j
+else
+ uncompress=z
+fi
+
+rm -rf mnt
+mkdir -p mnt
+
+fakeroot bash -c "\
+tar -x$uncompress -f $1 -C mnt; \
+genext2fs -d mnt -b $(($2 * 1024)) $dir/$base.img; \
+rm -rf mnt; \
+"
============================================================
--- contrib/image-convert/tar2ext2.mount f3a784276701f55e27d354d61098277d73ad6103
+++ contrib/image-convert/tar2ext2.mount f3a784276701f55e27d354d61098277d73ad6103
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+if [ $# -ne 2 ]; then
+ echo "Usage: $0 <tarball> <ext2 size>"
+ exit
+fi
+
+ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'`
+base=$(basename $1 .$ext)
+if [ "$ext" == "tar.bz2" ]; then
+ uncompress=j
+else
+ uncompress=z
+fi
+
+dd if=/dev/zero of=$base.img bs=1M count=$2
+mkfs.ext2 -F -m1 $base.img
+
+mkdir -p mnt
+mount -o loop $base.img mnt
+
+tar -x$uncompress -f $1 -C mnt
+
+umount mnt
+rm -rf mnt
============================================================
--- contrib/image-convert/tar2jffs 351ffdf2f7346259f133eeed2e6477c83e34d59a
+++ contrib/image-convert/tar2jffs 351ffdf2f7346259f133eeed2e6477c83e34d59a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+STAGING= #~/linux-ppc/build-oe-angstrom/tmp/staging/i686-linux/bin/
+
+${STAGING}fakeroot bash -c " \
+rm -rf scratch; mkdir scratch; \
+tar -xj -f $1 -C scratch; \
+${STAGING}mkfs.jffs2 -x lzo --root=scratch --faketime --output=$(dirname $1)/$(basename $1 .tar.bz2).jffs2"
More information about the Openembedded-commits
mailing list