From 6c2b02774fe3346deaa75b113abca354e32bf361 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 01:56:36 +0000 Subject: jpeg: change to use autotools_stage_all in 6b - native and cross changed. do_install is no longer required as - a patch has been added to fix the failure of the Makefile install - to create the target directory. --- packages/jpeg/jpeg-6b/install.patch | 28 ++++++++++++++++++++++++++++ packages/jpeg/jpeg-native_6b.bb | 7 +------ packages/jpeg/jpeg_6b.bb | 17 ++++------------- 3 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 packages/jpeg/jpeg-6b/install.patch diff --git a/packages/jpeg/jpeg-6b/install.patch b/packages/jpeg/jpeg-6b/install.patch new file mode 100644 index 0000000000..742594a11f --- /dev/null +++ b/packages/jpeg/jpeg-6b/install.patch @@ -0,0 +1,28 @@ +--- jpeg-6b/makefile.cfg.orig 2005-12-29 12:51:05.584736333 -0800 ++++ jpeg-6b/makefile.cfg 2005-12-29 12:55:05.075806556 -0800 +@@ -192,11 +192,13 @@ wrjpgcom: wrjpgcom.$(O) + # Installation rules: + + install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@ ++ $(INSTALL) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg + $(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg + $(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran + $(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom + $(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom ++ $(INSTALL) -d $(DESTDIR)$(mandir) + $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext) + $(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext) + $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext) +@@ -204,9 +206,11 @@ install: cjpeg djpeg jpegtran rdjpgcom w + $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext) + + install-lib: libjpeg.$(A) install-headers ++ $(INSTALL) -d $(DESTDIR)$(libdir) + $(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A) + + install-headers: jconfig.h ++ $(INSTALL) -d $(DESTDIR)$(includedir) + $(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h + $(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)$(includedir)/jpeglib.h + $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)$(includedir)/jmorecfg.h diff --git a/packages/jpeg/jpeg-native_6b.bb b/packages/jpeg/jpeg-native_6b.bb index b617f1b6c0..420cc9fd4b 100644 --- a/packages/jpeg/jpeg-native_6b.bb +++ b/packages/jpeg/jpeg-native_6b.bb @@ -5,10 +5,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/jpeg-${PV}" DEPENDS = "" do_stage() { - install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h - install -m 644 jpeglib.h ${STAGING_INCDIR}/jpeglib.h - install -m 644 jmorecfg.h ${STAGING_INCDIR}/jmorecfg.h - install -m 644 jerror.h ${STAGING_INCDIR}/jerror.h - install -m 644 jpegint.h ${STAGING_INCDIR}/jpegint.h - oe_libinstall -so libjpeg ${STAGING_LIBDIR} + autotools_stage_all } diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb index 49e0382b6e..277cdfa48c 100644 --- a/packages/jpeg/jpeg_6b.bb +++ b/packages/jpeg/jpeg_6b.bb @@ -1,3 +1,4 @@ +PR = "r1" SECTION = "libs" PRIORITY = "required" MAINTAINER = "Chris Larson " @@ -9,7 +10,8 @@ LICENSE ="jpeg" SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ file://debian.patch;patch=1 \ file://ldflags.patch;patch=1 \ - file://paths.patch;patch=1" + file://paths.patch;patch=1 \ + file://install.patch;patch=1" S = "${WORKDIR}/jpeg-${PV}" inherit autotools @@ -20,16 +22,5 @@ EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"' CFLAGS_append = " -D_REENTRANT" do_stage() { - install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h - install -m 644 jpeglib.h ${STAGING_INCDIR}/jpeglib.h - install -m 644 jmorecfg.h ${STAGING_INCDIR}/jmorecfg.h - install -m 644 jerror.h ${STAGING_INCDIR}/jerror.h - install -m 644 jpegint.h ${STAGING_INCDIR}/jpegint.h - oe_libinstall -so libjpeg ${STAGING_LIBDIR} -} - -do_install() { - install -d ${D}${bindir} ${D}${includedir} \ - ${D}${mandir}/man1 ${D}${libdir} - oe_runmake 'DESTDIR=${D}' install + autotools_stage_all } -- cgit v1.2.3 From 7e6d4a5f4928395017651ad8bfc6114b26a9be67 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 01:57:25 +0000 Subject: bluez-libs: change do_stage to use autotools_stage_all in 2.21 --- packages/bluez/bluez-libs_2.21.bb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/bluez/bluez-libs_2.21.bb b/packages/bluez/bluez-libs_2.21.bb index d740bd80a9..e5ef923d03 100644 --- a/packages/bluez/bluez-libs_2.21.bb +++ b/packages/bluez/bluez-libs_2.21.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "optional" HOMEPAGE = "http://www.bluez.org" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" @@ -12,11 +12,5 @@ inherit autotools pkgconfig HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" do_stage() { - oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/bluetooth/ - for f in ${HEADERS} - do - install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f - done + autotools_stage_all } -- cgit v1.2.3 From 8d25d4a92eb85efbc6eef647858962a5a80ec2a3 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 01:58:41 +0000 Subject: cyrus-sasl: change do_stage to use autotools_stage_all in 2.1.19 --- packages/cyrus-sasl/cyrus-sasl_2.1.19.bb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb index 90c44c912f..ba6dc65f88 100644 --- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb +++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb @@ -2,7 +2,7 @@ SECTION = "console/network" DEPENDS = "openssl virtual/db" DESCRIPTION = "Generic client/server library for SASL authentication." LICENSE = "BSD" -PR = "r7" +PR = "r8" SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \ file://berkdb.m4.patch;patch=1" @@ -33,16 +33,7 @@ do_compile_prepend () { } do_stage () { - oe_libinstall -so -a -C lib libsasl2 ${STAGING_LIBDIR} - install -d ${STAGING_LIBDIR}/sasl2 - install -d ${STAGING_INCDIR}/sasl - install -m 0644 ${S}/include/hmac-md5.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/md5.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/md5global.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/sasl.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/saslplug.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/saslutil.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/prop.h ${STAGING_INCDIR}/sasl/ + autotools_stage_all } pkg_postinst () { -- cgit v1.2.3 From 43d7b0192f905760f80009ca84a4f2b977b9be5b Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 01:59:19 +0000 Subject: sysfsutils: change do_stage to use autotools_stage_all in 1.3.0 --- packages/sysfsutils/sysfsutils_1.3.0.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/sysfsutils/sysfsutils_1.3.0.bb b/packages/sysfsutils/sysfsutils_1.3.0.bb index 82af8d353d..ec8499020f 100644 --- a/packages/sysfsutils/sysfsutils_1.3.0.bb +++ b/packages/sysfsutils/sysfsutils_1.3.0.bb @@ -1,3 +1,4 @@ +PR = "r1" SECTION = "base" DESCRIPTION = "System Utilities Based on Sysfs" HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" @@ -14,8 +15,5 @@ PACKAGES_prepend = "libsysfs " FILES_libsysfs = "${libdir}/*.so.1.0.3" do_stage () { - oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/sysfs - install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs - install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs + autotools_stage_all } -- cgit v1.2.3 From de44fa141e4d115141e0fff00e4304d9bb9faf9e Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 3 Jan 2006 21:35:43 +0000 Subject: disapproval of revision '97dc9b1bab1e50b43f23ce37062529fa51c369c9' --- packages/sysfsutils/sysfsutils_1.3.0.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/sysfsutils/sysfsutils_1.3.0.bb b/packages/sysfsutils/sysfsutils_1.3.0.bb index ec8499020f..82af8d353d 100644 --- a/packages/sysfsutils/sysfsutils_1.3.0.bb +++ b/packages/sysfsutils/sysfsutils_1.3.0.bb @@ -1,4 +1,3 @@ -PR = "r1" SECTION = "base" DESCRIPTION = "System Utilities Based on Sysfs" HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" @@ -15,5 +14,8 @@ PACKAGES_prepend = "libsysfs " FILES_libsysfs = "${libdir}/*.so.1.0.3" do_stage () { - autotools_stage_all + oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/sysfs + install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs + install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs } -- cgit v1.2.3