From 85ce1502413da65b31ac1e0ed9fe364e5295ada2 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 22 Jul 2005 17:51:31 +0000 Subject: Update dependencies and package names. --- packages/meta/meta-sdk.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index 757c72ecb3..962572d546 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -1,6 +1,7 @@ -PR = "r2" +PR = "r3" DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe" +DEPENDS += "libidl libsvg-cairo" PACKAGES = "" @@ -19,7 +20,7 @@ compositeext-dev \ damageext-dev \ dbus-dev \ fixesext-dev \ -gconf-dev \ +gconf-dbus-dev \ gtk+-dev \ gtk-engines-dev \ libapm-dev \ @@ -86,17 +87,15 @@ libxtst-dev \ libz-dev \ matchbox-desktop-dev \ ncurses-dev \ -orbit2-dev \ pango-dev \ randrext-dev \ recordext-dev \ renderext-dev \ resourceext-dev \ -rxvt-unicode-dev \ -wireless-tools-dev \ +libiw-dev \ xcalibrateext-dev \ xextensions-dev \ -xmu-dev \ +libxmu-dev \ xproto-dev \ xtrans-dev \ " @@ -148,7 +147,7 @@ EOF echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${libdir}/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status rm -rf ${SDK_OUTPUT}${libdir}/ipkg # remove unwanted executables -- cgit v1.2.3 From b0d05180ede75bb06ca7a04a0c0108814845f946 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 22 Jul 2005 17:53:30 +0000 Subject: Set correct RPROVIDES for development package. --- packages/gnome/gconf-dbus_cvs.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb index 71ff770f52..a403fae24c 100644 --- a/packages/gnome/gconf-dbus_cvs.bb +++ b/packages/gnome/gconf-dbus_cvs.bb @@ -4,10 +4,11 @@ DESCRIPTION = "Settings daemon using DBUS for communication." LICENSE = "GPL" MAINTAINER = "Florian Boor " PROVIDES = "gconf" -RPROVIDES = "gconf" +RPROVIDES_${PN} = "gconf" +RPROVIDES_${PN}-dev = "gconf-dev" PV = "0.0cvs${CVSDATE}" -PR = "r5" +PR = "r6" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \ file://gconf-dbus-update.patch;patch=1;pnum=0 \ -- cgit v1.2.3 From c6f7574b881a050c83b71c50810fe13c67c7ad2d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Jul 2005 17:54:18 +0000 Subject: add cvs version of gpsdrive --- packages/gpsdrive/gpsdrive_cvs.bb | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/gpsdrive/gpsdrive_cvs.bb diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb new file mode 100644 index 0000000000..0dc0bdbe7d --- /dev/null +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -0,0 +1,30 @@ +inherit autotools pkgconfig + +PR = "r0" +DEFAULT_PREFERENCE="-1" + +PACKAGES += "gpsdrive-add" +DESCRIPTION = "GPS navigation/map display software" +DEPENDS = "virtual/libc gtk+ pcre gpsd" +RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" +MAINTAINER = "Florian Boor " +SECTION = "x11" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "http://www.ostertag.name/tweety/Projekte/gpsdrive/gpsdrive-2.10pre3.tar.gz \ + file://gpsdrive.desktop" + +CFLAGS += "-D_GNU_SOURCE" + +FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN} += "${datadir}/${PN}" + +FILES_gpsdrive-add = "${libdir}" + +EXTRA_OECONF = "--disable-garmin" + +do_install_append () { + mkdir -p ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop +} -- cgit v1.2.3 From cbc5f93512d471c7fde024aeb0c7199e12d4e46b Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 22 Jul 2005 17:55:14 +0000 Subject: Add a pile of definitions from gcc-cross_3.3.4.bb to separate gcc-cross-sdk into several packages in order to avoid dependency trouble. --- packages/gcc/gcc-cross-sdk_3.3.4.bb | 43 ++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb index 562f67114a..e298b1caa1 100644 --- a/packages/gcc/gcc-cross-sdk_3.3.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb @@ -3,7 +3,11 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Phil Blundell " -PR = "r1" +PR = "r2" +include gcc_${PV}.bb + +# Files for these are defined in the main gcc.oe +#PACKAGES = "libgcc libstdc++ libg2c" inherit autotools sdk @@ -75,6 +79,39 @@ do_compile () { oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}" } -do_install () { - autotools_do_install +#do_install () { +# autotools_do_install +#} + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_libgcc', 'libgcc1', d) + bb.build.exec_func('package_do_package', d) } + +do_install () { + oe_runmake 'DESTDIR=${D}' install + + # Move libgcc_s into /lib + mkdir -p ${D}${base_libdir} + if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then + # native builds drop one pathname component + mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir} + else + mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir} + fi + + # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr + TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'` + mkdir -p ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR} + + # Manually run the target stripper since we won't get it run by + # the packaging. + if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.* + ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* + fi +} \ No newline at end of file -- cgit v1.2.3 From 45bfdb4d8ea30f82987c8a4a542be760c5363333 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Jul 2005 17:55:31 +0000 Subject: add cvs version of gpsdrive --- packages/gpsdrive/gpsdrive_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index 0dc0bdbe7d..2bf7f81bd9 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -12,7 +12,7 @@ SECTION = "x11" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI = "http://www.ostertag.name/tweety/Projekte/gpsdrive/gpsdrive-2.10pre3.tar.gz \ +SRC_URI = "cvs://www.ostertag.name/tweety/Projekte/gpsdrive/gpsdrive-2.10pre3.tar.gz \ file://gpsdrive.desktop" CFLAGS += "-D_GNU_SOURCE" -- cgit v1.2.3 From bf3a7d5b269b70bcbed1659a739d70a58ea4d40f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Jul 2005 18:01:11 +0000 Subject: fix srcuri and pv of gpsdrive_cvs --- packages/gpsdrive/gpsdrive_cvs.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index 2bf7f81bd9..f1359416fd 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -1,6 +1,7 @@ inherit autotools pkgconfig PR = "r0" +PV = "2.10pre3+cvs-${CVSDATE}" DEFAULT_PREFERENCE="-1" PACKAGES += "gpsdrive-add" @@ -12,9 +13,10 @@ SECTION = "x11" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI = "cvs://www.ostertag.name/tweety/Projekte/gpsdrive/gpsdrive-2.10pre3.tar.gz \ +SRC_URI = "cvs://anonymous@cvs.gpsdrive.cc/cvsroot;module=gpsdrive \ file://gpsdrive.desktop" +S = "${WORKDIR}/gpsdrive" CFLAGS += "-D_GNU_SOURCE" FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications" -- cgit v1.2.3 From c2d6818d07a07a313a4a67cbfacdc9a7694a11b9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Jul 2005 18:07:44 +0000 Subject: change maintainer of gpsdrive_cvs --- packages/gpsdrive/gpsdrive_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index f1359416fd..cc623451ef 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -8,7 +8,7 @@ PACKAGES += "gpsdrive-add" DESCRIPTION = "GPS navigation/map display software" DEPENDS = "virtual/libc gtk+ pcre gpsd" RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" -MAINTAINER = "Florian Boor " +MAINTAINER = "Koen Kooi " SECTION = "x11" PRIORITY = "optional" LICENSE = "GPL" -- cgit v1.2.3