From 584eab1457a3cfc4c54069e27a667df1d1c1f5af Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 02:06:32 +0000 Subject: ssmtp, nail: inhibit autotools stage in nail 11.21, ssmtp 2.61 --- packages/nail/nail_11.21.bb | 4 +++- packages/ssmtp/ssmtp_2.61.bb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/nail/nail_11.21.bb b/packages/nail/nail_11.21.bb index 3162fb50b3..a4818c286a 100644 --- a/packages/nail/nail_11.21.bb +++ b/packages/nail/nail_11.21.bb @@ -3,7 +3,7 @@ SECTION = "console/network" PRIORITY = "optional" MAINTAINER = "NSLU2 Linux " DEPENDS = "openssl" -PR = "r1" +PR = "r2" LICENSE = "GPL" SRC_URI = "http://optusnet.dl.sourceforge.net/sourceforge/nail/nail-11.21.tar.bz2 \ @@ -15,6 +15,8 @@ inherit autotools # EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes" +INHIBIT_AUTO_STAGE = "1" + do_install() { install -d ${D}${bindir} ${D}${mandir} ${D}${sysconfdir} install -m 0755 ${S}nail ${D}${bindir}/nail diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb index acfa068cac..0f208da2df 100644 --- a/packages/ssmtp/ssmtp_2.61.bb +++ b/packages/ssmtp/ssmtp_2.61.bb @@ -3,7 +3,7 @@ MAINTAINER = "Oyvind Repvik " DEPENDS = "openssl" DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub." LICENSE = "GPL" -PR = "r5" +PR = "r6" SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \ file://ldflags.patch;patch=1 \ @@ -20,6 +20,8 @@ do_compile () { oe_runmake 'LDFLAGS=${LDFLAGS}' } +INHIBIT_AUTO_STAGE = "1" + do_install () { oe_runmake 'prefix=${D}${prefix}' 'exec_prefix=${D}${exec_prefix}' \ 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' \ -- cgit v1.2.3 From d51e4a61d7ef89f28ad0b4cc7277d38e44730c15 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 02:07:30 +0000 Subject: puppy: inhibit autotools stage in puppy 1.11 --- packages/puppy/puppy_1.11.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/puppy/puppy_1.11.bb b/packages/puppy/puppy_1.11.bb index d82b673864..89c8dc4317 100644 --- a/packages/puppy/puppy_1.11.bb +++ b/packages/puppy/puppy_1.11.bb @@ -4,13 +4,15 @@ PRIORITY = "optional" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://sf.net/projects/puppy/" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_11" S = "${WORKDIR}/puppy" inherit autotools +INHIBIT_AUTO_STAGE = "1" + do_install() { install -d ${D}${bindir} install -m 0755 ${S}/puppy ${D}${bindir}/puppy -- cgit v1.2.3 From 7039ccd1332286801a661dfe98df90987b1c0481 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 02:07:58 +0000 Subject: popt: change do_stage to use autotools_stage_all in 1.7 --- packages/popt/popt_1.7.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/popt/popt_1.7.bb b/packages/popt/popt_1.7.bb index 41af18ed58..e599c023dc 100644 --- a/packages/popt/popt_1.7.bb +++ b/packages/popt/popt_1.7.bb @@ -2,7 +2,7 @@ SECTION = "libs" DESCRIPTION = "The popt library exists essentially \ for parsing command line options." LICENSE = "MIT" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \ file://m4.patch;patch=1 \ @@ -11,6 +11,5 @@ SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \ inherit autotools do_stage () { - oe_libinstall -a -so libpopt ${STAGING_LIBDIR} - install -m 0644 popt.h ${STAGING_INCDIR}/ + autotools_stage_all } -- cgit v1.2.3 From 6377266f6adf67628c086070bad26e13ebbde817 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 02:08:32 +0000 Subject: openobex: change do_stage to use autotools_stage_all in 1.0.1 --- packages/openobex/openobex_1.0.1.bb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/openobex/openobex_1.0.1.bb b/packages/openobex/openobex_1.0.1.bb index c3b1562e8d..fd38d372f6 100644 --- a/packages/openobex/openobex_1.0.1.bb +++ b/packages/openobex/openobex_1.0.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The Openobex project aims to make an \ open source implementation of the Object Exchange \ (OBEX) protocol." SECTION = "libs" -PR = "r2" +PR = "r3" # put openobex-config into -dev package FILES_${PN} = "${libdir}/lib*.so.*" @@ -15,10 +15,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ inherit autotools binconfig do_stage () { - oe_libinstall -so -C src libopenobex ${STAGING_LIBDIR} - ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.0.so - install -d ${STAGING_INCDIR}/openobex - install -m 0644 src/obex_const.h src/obex.h ${STAGING_INCDIR}/openobex/ - install -d ${STAGING_DIR}/aclocal - install -m 0644 m4macros/openobex.m4 ${STAGING_DATADIR}/aclocal/ + autotools_stage_all } -- cgit v1.2.3 From 00d912eeab6c518c86c1030979dd19d6499ba181 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 02:09:03 +0000 Subject: nfs-utils: inhibit autotools stage in 1.0.6 --- packages/nfs-utils/nfs-utils_1.0.6.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index a95badd85f..0e2fefc51b 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" SECTION = "console/networking" MAINTAINER = "dyoung " LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ @@ -35,6 +35,8 @@ do_compile() { oe_runmake 'BUILD=1' } +INHIBIT_AUTO_STAGE = "1" + do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver -- cgit v1.2.3 From 4528c1c7f1e8a9f0d37d3b4d09cfe3a6835f8cf5 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 02:09:43 +0000 Subject: ncftp: inhibit autotools stage in 3.1.9 --- packages/ncftp/ncftp_3.1.9.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/ncftp/ncftp_3.1.9.bb b/packages/ncftp/ncftp_3.1.9.bb index 99673d8a97..d62b0ffeae 100644 --- a/packages/ncftp/ncftp_3.1.9.bb +++ b/packages/ncftp/ncftp_3.1.9.bb @@ -1,3 +1,4 @@ +PR = "r1" DESCRIPTION = "A sophisticated console ftp client" SECTION = "console/network" PRIORITY = "optional" @@ -11,6 +12,8 @@ do_configure_prepend () { install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4 } +INHIBIT_AUTO_STAGE = "1" + do_install () { install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \ -- cgit v1.2.3 From e8ff137fcce47b5e3b6b462fa44f141ea08b7de1 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 02:10:49 +0000 Subject: lzo: change do_stage to use autotools_stage_all in 1.08 --- packages/lzo/lzo_1.08.bb | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/packages/lzo/lzo_1.08.bb b/packages/lzo/lzo_1.08.bb index 613340308e..7986650e78 100644 --- a/packages/lzo/lzo_1.08.bb +++ b/packages/lzo/lzo_1.08.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/" LICENSE = "GPLv2" SECTION = "libs" PRIORITY = "optional" -PR = "r12" +PR = "r13" SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz" @@ -19,18 +19,5 @@ EXTRA_OECONF = "--enable-shared" #} do_stage() { - install -m 0644 include/lzo1.h ${STAGING_INCDIR}/lzo1.h - install -m 0644 include/lzo16bit.h ${STAGING_INCDIR}/lzo16bit.h - install -m 0644 include/lzo1a.h ${STAGING_INCDIR}/lzo1a.h - install -m 0644 include/lzo1b.h ${STAGING_INCDIR}/lzo1b.h - install -m 0644 include/lzo1c.h ${STAGING_INCDIR}/lzo1c.h - install -m 0644 include/lzo1f.h ${STAGING_INCDIR}/lzo1f.h - install -m 0644 include/lzo1x.h ${STAGING_INCDIR}/lzo1x.h - install -m 0644 include/lzo1y.h ${STAGING_INCDIR}/lzo1y.h - install -m 0644 include/lzo1z.h ${STAGING_INCDIR}/lzo1z.h - install -m 0644 include/lzo2a.h ${STAGING_INCDIR}/lzo2a.h - install -m 0644 include/lzoconf.h ${STAGING_INCDIR}/lzoconf.h - install -m 0644 include/lzoutil.h ${STAGING_INCDIR}/lzoutil.h - - oe_libinstall -a -so -C src liblzo ${STAGING_LIBDIR} + autotools_stage_all } -- cgit v1.2.3 From 67cb2da0effe1a1a6b7b8f8f7baa04c6ed646080 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 02:11:26 +0000 Subject: libao: change do_stage to use autotools_stage_all in 0.8.6 --- packages/libao/libao_0.8.6.bb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb index 62275f14fb..a293a44270 100644 --- a/packages/libao/libao_0.8.6.bb +++ b/packages/libao/libao_0.8.6.bb @@ -3,7 +3,7 @@ DESCRIPTION = "A cross platform audio library" HOMEPAGE = "http://www.xiph.org/ao/" SECTION = "libs" PRIORITY = "optional" -PR = "r0" +PR = "r1" SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" @@ -14,13 +14,7 @@ EXTRA_OECONF = "--disable-esd --disable-esdtest \ --disable-arts --disable-nas" do_stage() { - install -d ${STAGING_INCDIR}/ao - install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \ - ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/ - - oe_libinstall -so -C src libao ${STAGING_LIBDIR} - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/ + autotools_stage_all } FILES_${PN} += "${libdir}/ao/plugins-2/*.so" -- cgit v1.2.3 From c0555ac66d6a83c492db19ef6d33748e540f09ac Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 02:12:40 +0000 Subject: libgphoto2: change do_stage to use autotools_stage_all in 2.1.6 --- packages/libgphoto2/libgphoto2_2.1.6.bb | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb index b814f9a469..2b7913ec5f 100644 --- a/packages/libgphoto2/libgphoto2_2.1.6.bb +++ b/packages/libgphoto2/libgphoto2_2.1.6.bb @@ -2,7 +2,7 @@ SECTION = "libs" DEPENDS = "jpeg libusb libexif" RPEDENDS = "libusb" DESCRIPTION = "libgphoto2 allows you to access digital cameras" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" @@ -12,25 +12,9 @@ LICENSE = "GPL" inherit autotools pkgconfig do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done + autotools_stage_all } + PACKAGES =+ "libgphoto2-camlibs" FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/" RDEPENDS_libgphoto2 = "libgphoto2-camlibs" - -- cgit v1.2.3 From 8a044e2b7f294444e444d70d55d1a4868640a069 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 21:32:38 +0000 Subject: disapproval of revision '40cd64edf16241a37663807e311fba8e23f0d258' --- packages/libgphoto2/libgphoto2_2.1.6.bb | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb index 2b7913ec5f..b814f9a469 100644 --- a/packages/libgphoto2/libgphoto2_2.1.6.bb +++ b/packages/libgphoto2/libgphoto2_2.1.6.bb @@ -2,7 +2,7 @@ SECTION = "libs" DEPENDS = "jpeg libusb libexif" RPEDENDS = "libusb" DESCRIPTION = "libgphoto2 allows you to access digital cameras" -PR = "r5" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" @@ -12,9 +12,25 @@ LICENSE = "GPL" inherit autotools pkgconfig do_stage() { - autotools_stage_all -} + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} PACKAGES =+ "libgphoto2-camlibs" FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/" RDEPENDS_libgphoto2 = "libgphoto2-camlibs" + -- cgit v1.2.3