diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
| commit | c58cc7d3796dcee6e93885c835ed04cb566abeb2 (patch) | |
| tree | 3eea4d4ef6a4ef79e0f4e025d7012c1a5cc38835 /recipes-support | |
| parent | eec6ab97f712e06eb52c9f7c99e19ffab3ce9d74 (diff) | |
| download | meta-openembedded-contrib-c58cc7d3796dcee6e93885c835ed04cb566abeb2.tar.gz | |
move layer into meta-oe in preparation for future splits
As per TSC decision
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-support')
50 files changed, 0 insertions, 1954 deletions
diff --git a/recipes-support/atk/atk.inc b/recipes-support/atk/atk.inc deleted file mode 100644 index a508012cfb..0000000000 --- a/recipes-support/atk/atk.inc +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "An accessibility toolkit for GNOME." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "LGPL" - -DEPENDS = "glib-2.0 gtk-doc-native" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-glibtest" - diff --git a/recipes-support/atk/atk_1.30.0.bb b/recipes-support/atk/atk_1.30.0.bb deleted file mode 100644 index cc8f573810..0000000000 --- a/recipes-support/atk/atk_1.30.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "An accessibility toolkit for GNOME." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "LGPLv2 & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \ - file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7 -PR = "r1" - -inherit gnome - -SRC_URI[archive.md5sum] = "548d413775819fef425410739041cac3" -SRC_URI[archive.sha256sum] = "92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c" - -DEPENDS = "glib-2.0 gtk-doc-native" - -EXTRA_OECONF += "--disable-glibtest" - -BBCLASSEXTEND = "native" - diff --git a/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch b/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch deleted file mode 100644 index 7b544ca0e3..0000000000 --- a/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 90069586167b930befce7303aea57078f04b4ed8 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Sun, 30 Jan 2011 16:37:27 +0100 -Subject: [PATCH] don't try to run generated binaries - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- - ppdc/Makefile | 30 +++++++++++++++--------------- - 1 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/ppdc/Makefile b/ppdc/Makefile -index 0288d47..fc87f1b 100644 ---- a/ppdc/Makefile -+++ b/ppdc/Makefile -@@ -243,8 +243,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \ - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ - libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ - $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) -- echo Generating localization strings... -- ./genstrings >sample.c -+# echo Generating localization strings... -+# ./genstrings >sample.c - - - # -@@ -261,9 +261,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ - ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ - $(COMMONLIBS) $(LIBZ) -- echo Testing PPD compiler... -- ./ppdc-static -l en,fr -I ../data foo.drv -- ./ppdc-static -l en,fr -z -I ../data foo.drv -+# echo Testing PPD compiler... -+# ./ppdc-static -l en,fr -I ../data foo.drv -+# ./ppdc-static -l en,fr -z -I ../data foo.drv - - - # -@@ -290,16 +290,16 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a - ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ - $(COMMONLIBS) $(LIBZ) - echo Testing PPD importer... -- $(RM) -r ppd ppd2 sample-import.drv -- ./ppdc-static -I ../data sample.drv -- ./ppdi-static -I ../data -o sample-import.drv ppd/* -- ./ppdc-static -I ../data -d ppd2 sample-import.drv -- if diff -r ppd ppd2 >/dev/null; then \ -- echo PPD import OK; \ -- else \ -- echo PPD import FAILED; \ -- exit 1; \ -- fi -+# $(RM) -r ppd ppd2 sample-import.drv -+# ./ppdc-static -I ../data sample.drv -+# ./ppdi-static -I ../data -o sample-import.drv ppd/* -+# ./ppdc-static -I ../data -d ppd2 sample-import.drv -+# if diff -r ppd ppd2 >/dev/null; then \ -+# echo PPD import OK; \ -+# else \ -+# echo PPD import FAILED; \ -+# exit 1; \ -+# fi - - - # --- -1.6.6.1 - diff --git a/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch b/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch deleted file mode 100644 index 21ff0e535b..0000000000 --- a/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/init/cups.sh.in.orig 2008-10-04 16:50:46.000000000 -0300 -+++ b/init/cups.sh.in 2008-10-04 16:51:39.000000000 -0300 -@@ -68,7 +68,7 @@ - ECHO_ERROR=: - ;; - -- Linux*) -+ DISABLELinux*) - IS_ON=/bin/true - if test -f /etc/init.d/functions; then - . /etc/init.d/functions diff --git a/recipes-support/cups/cups14.inc b/recipes-support/cups/cups14.inc deleted file mode 100644 index 430d3ab5b5..0000000000 --- a/recipes-support/cups/cups14.inc +++ /dev/null @@ -1,84 +0,0 @@ -DESCRIPTION = "An Internet printing system for Unix." -SECTION = "console/utils" -LICENSE = "GPLv2 LGPLv2" -DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib" -PROVIDES = "cups14" - -SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2" - -LEAD_SONAME = "libcupsdriver.so" - -inherit autotools binconfig - -EXTRA_OECONF = " \ - --enable-gnutls \ - --enable-dbus \ - --enable-browsing \ - --disable-openssl \ - --disable-tiff \ - --without-php \ - --without-perl \ - --without-python \ - --without-java \ - " - - -do_configure() { - gnu-configize - libtoolize --force - DSOFLAGS="${LDFLAGS}" oe_runconf -} - -do_compile () { - sed -i s:STRIP:NOSTRIP: Makedefs - sed -i s:serial:: backend/Makefile - - echo "all:" > man/Makefile - echo "libs:" >> man/Makefile - echo "install:" >> man/Makefile - echo "install-data:" >> man/Makefile - echo "install-exec:" >> man/Makefile - echo "install-headers:" >> man/Makefile - echo "install-libs:" >> man/Makefile - - oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \ - "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \ - "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \ - "LIBZ=-lz -L${STAGING_LIBDIR}" \ - "-I." -} - -fakeroot do_install () { - oe_runmake "DSTROOT=${D}" install - - # This directory gets installed with perms 511, which makes packaging fail - chmod 0711 "${D}/${localstatedir}/run/cups/certs" -} - -python do_package_append() { - # Change permissions back the way they were, they probably had a reason... - workdir = bb.data.getVar('WORKDIR', d, 1) - os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir) -} - -PACKAGES =+ "${PN}-lib ${PN}-libimage" - -FILES_${PN}-lib = "${libdir}/libcups.so.*" - -FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" - -FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ - ${libdir}/cups/cgi-bin/.debug \ - ${libdir}/cups/filter/.debug \ - ${libdir}/cups/monitor/.debug \ - ${libdir}/cups/notifier/.debug \ - ${libdir}/cups/daemon/.debug \ - " - -#package the html for the webgui inside the main packages (~1MB uncompressed) - -FILES_${PN} += "${datadir}/doc/cups/images \ - ${datadir}/doc/cups/*html \ - ${datadir}/doc/cups/*.css \ - ${datadir}/icons/ \ - " diff --git a/recipes-support/cups/cups_1.4.6.bb b/recipes-support/cups/cups_1.4.6.bb deleted file mode 100644 index 783ecf6b3a..0000000000 --- a/recipes-support/cups/cups_1.4.6.bb +++ /dev/null @@ -1,17 +0,0 @@ -require cups14.inc - -DEPENDS += "virtual/libusb0" - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9" - -SRC_URI += " \ - file://use_echo_only_in_init.patch \ - file://0001-don-t-try-to-run-generated-binaries.patch \ - " - -SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1" -SRC_URI[sha256sum] = "f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514" - -EXTRA_OECONF += " --disable-gssapi --enable-debug --disable-relro --enable-libusb" - -CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" diff --git a/recipes-support/htop/htop/remove-proc-test.patch b/recipes-support/htop/htop/remove-proc-test.patch deleted file mode 100644 index 3185fdd1f4..0000000000 --- a/recipes-support/htop/htop/remove-proc-test.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- htop-0.6.6/configure.ac 2007-05-21 13:06:15.000000000 -0500 -+++ htop-0.6.6-cross/configure.ac 2007-11-16 14:12:16.000000000 -0600 -@@ -58,8 +58,8 @@ - fi, - AC_DEFINE(PROCDIR, "/proc", [Path of proc filesystem])) - --AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) --AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) -+#AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) -+#AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) - - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT diff --git a/recipes-support/htop/htop_0.9.bb b/recipes-support/htop/htop_0.9.bb deleted file mode 100644 index eb207aabe6..0000000000 --- a/recipes-support/htop/htop_0.9.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "htop process monitor" -HOMEPAGE = "http://htop.sf.net" -SECTION = "console/utils" -PRIORITY = "optional" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" - -DEPENDS = "ncurses" -RDEPENDS_${PN} = "ncurses-terminfo" - -SRC_URI = "${SOURCEFORGE_MIRROR}/htop/htop-${PV}.tar.gz \ - file://remove-proc-test.patch" - -inherit autotools - -SRC_URI[md5sum] = "7c5507f35f363f3f40183a2ba3c561f8" -SRC_URI[sha256sum] = "4de65c38e1886bccd30ed692b30eb9bf195240680781bfe1eaf5faf84ee6fbfd" - diff --git a/recipes-support/libgcrypt/libgcrypt.inc b/recipes-support/libgcrypt/libgcrypt.inc deleted file mode 100644 index da882dcc7e..0000000000 --- a/recipes-support/libgcrypt/libgcrypt.inc +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG" -HOMEPAGE = "http://directory.fsf.org/project/libgcrypt/" -BUGTRACKER = "https://bugs.g10code.com/gnupg/index" -SECTION = "libs" -PRIORITY = "optional" - -BBCLASSEXTEND = "native" - -# helper program gcryptrnd and getrandom are under GPL, rest LGPL -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff" - -DEPENDS = "libgpg-error" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ - file://add-pkgconfig-support.patch" - -inherit autotools binconfig pkgconfig - -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" - -# libgcrypt.pc is added locally and thus installed here -do_install_append() { - install -d ${D}/${libdir}/pkgconfig - install -m 0644 ${S}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/ -} - -ARM_INSTRUCTION_SET = "arm" - -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig/*.pc" diff --git a/recipes-support/libgcrypt/libgcrypt/add-pkgconfig-support.patch b/recipes-support/libgcrypt/libgcrypt/add-pkgconfig-support.patch deleted file mode 100644 index 24a59787a2..0000000000 --- a/recipes-support/libgcrypt/libgcrypt/add-pkgconfig-support.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: libgcrypt-1.2.4/configure.ac -=================================================================== ---- libgcrypt-1.2.4.orig/configure.ac 2008-03-19 22:14:50.000000000 +0000 -+++ libgcrypt-1.2.4/configure.ac 2008-03-19 22:14:58.000000000 +0000 -@@ -807,6 +807,7 @@ - doc/Makefile - src/Makefile - src/gcrypt.h -+src/libgcrypt.pc - src/libgcrypt-config - tests/Makefile - w32-dll/Makefile -Index: libgcrypt-1.2.4/src/libgcrypt.pc.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libgcrypt-1.2.4/src/libgcrypt.pc.in 2008-03-19 22:14:58.000000000 +0000 -@@ -0,0 +1,32 @@ -+# Process this file with autoconf to produce a pkg-config metadata file. -+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation -+# Author: Simon Josefsson -+# -+# This file is free software; as a special exception the author gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+# -+# This file is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+# API info -+api_version=@LIBGCRYPT_CONFIG_API_VERSION@ -+ -+# Misc information. -+symmetric_ciphers=@LIBGCRYPT_CIPHERS@ -+asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@ -+digests=@LIBGCRYPT_DIGESTS@ -+ -+Name: libgcrypt -+Description: GNU crypto library -+URL: http://www.gnupg.org -+Version: @VERSION@ -+Libs: -L${libdir} -lgcrypt -+Libs.private: -L${libdir} -lgpg-error -+Cflags: -I${includedir} diff --git a/recipes-support/libgcrypt/libgcrypt_1.4.6.bb b/recipes-support/libgcrypt/libgcrypt_1.4.6.bb deleted file mode 100644 index a592437913..0000000000 --- a/recipes-support/libgcrypt/libgcrypt_1.4.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -require libgcrypt.inc - -PR = "r0" diff --git a/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch b/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch deleted file mode 100644 index 49e47d874e..0000000000 --- a/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch +++ /dev/null @@ -1,53 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: libgpg-error-1.8/configure.ac -=================================================================== ---- libgpg-error-1.8.orig/configure.ac 2010-05-06 06:01:08.000000000 -0700 -+++ libgpg-error-1.8/configure.ac 2010-07-21 02:20:20.923261305 -0700 -@@ -140,6 +140,7 @@ - AC_SUBST(GPG_ERROR_CONFIG_CFLAGS) - AC_SUBST(GPG_ERROR_CONFIG_ISUBDIRAFTER) - AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) -+AC_CONFIG_FILES([src/gpg-error.pc]) - - - # Special defines for certain platforms -Index: libgpg-error-1.8/src/Makefile.am -=================================================================== ---- libgpg-error-1.8.orig/src/Makefile.am 2010-04-14 02:16:44.000000000 -0700 -+++ libgpg-error-1.8/src/Makefile.am 2010-07-21 02:22:36.655012496 -0700 -@@ -37,13 +37,15 @@ - bin_SCRIPTS = gpg-error-config - m4datadir = $(datadir)/aclocal - m4data_DATA = gpg-error.m4 -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = gpg-error.pc - - EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ - mkerrnos.awk errnos.in README \ - mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ - mkheader.awk gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ - err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ -- gpg-error.def.in versioninfo.rc.in -+ gpg-error.def.in versioninfo.rc.in gpg-error.pc.in - - BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ - err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h \ -Index: libgpg-error-1.8/src/gpg-error.pc.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libgpg-error-1.8/src/gpg-error.pc.in 2010-07-21 02:20:20.923261305 -0700 -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: gpg-error -+Description: a library that defines common error values for all GnuPG components -+Version: @VERSION@ -+Libs: -L{libdir} -lgpg-error -+Cflags: -I${includedir} diff --git a/recipes-support/libgpg-error/libgpg-error_1.8.bb b/recipes-support/libgpg-error/libgpg-error_1.8.bb deleted file mode 100644 index 5f6b72cd50..0000000000 --- a/recipes-support/libgpg-error/libgpg-error_1.8.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "a small library that defines common error values for all GnuPG components" -HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" -BUGTRACKER = "https://bugs.g10code.com/gnupg/index" - -BBCLASSEXTEND = "native" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/gpg-error.h;endline=23;md5=83c16c8f5cea85affa1ff270a6f4fcff \ - file://src/init.c;endline=20;md5=b69742f2a8827d494c6f6a4b1768416c" - - -SECTION = "libs" -LICENSE = "GPLv2+ & LGPLv2.1+" -DEPENDS = "gettext" -PR = "r0" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ - file://pkgconfig.patch;" - -# move libgpg-error-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*" - -inherit autotools binconfig pkgconfig diff --git a/recipes-support/libusb/libusb-compat_0.1.3.bbappend b/recipes-support/libusb/libusb-compat_0.1.3.bbappend deleted file mode 100644 index 7de23617db..0000000000 --- a/recipes-support/libusb/libusb-compat_0.1.3.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -PROVIDES += "virtual/libusb0" - -inherit lib_package - diff --git a/recipes-support/mysql/files/autofoo.patch b/recipes-support/mysql/files/autofoo.patch deleted file mode 100644 index 669393a23b..0000000000 --- a/recipes-support/mysql/files/autofoo.patch +++ /dev/null @@ -1,319 +0,0 @@ -diff -aurp mysql-4.1.22.old/acinclude.m4 mysql-4.1.22/acinclude.m4 ---- mysql-4.1.22.old/acinclude.m4 2008-09-18 13:00:13.000000000 -0500 -+++ mysql-4.1.22/acinclude.m4 2008-09-18 12:58:41.000000000 -0500 -@@ -1,5 +1,88 @@ - # Local macros for automake & autoconf - -+AH_TEMPLATE([SPRINTF_RETURNS_INT], [sprintf returns an int]) -+AH_TEMPLATE([SPRINTF_RETURNS_PTR], [sprintf returns a char *]) -+AH_TEMPLATE([SPRINTF_RETURNS_GARBAGE], [sprintf returns something unknown to us]) -+ -+AC_DEFUN([MYSQL_SPRINTF_RET], [ -+ AC_CACHE_CHECK([return type of sprintf], -+ [mysql_cv_func_sprintf_ret], [ -+ old_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" -+ AC_COMPILE_IFELSE([ -+#include <stdio.h> -+int sprintf(char *str, const char *format, ...); -+ ], [mysql_cv_func_sprintf_ret=int], -+ AC_COMPILE_IFELSE([ -+#include <stdio.h> -+char * sprintf(char *str, const char *format, ...); -+ ], [mysql_cv_func_sprintf_ret=ptr], -+ [mysql_cv_func_sprintf_ret=unknown]) -+ ) -+ CFLAGS="$old_CFLAGS" -+ ]) -+ if test x"$mysql_cv_func_sprintf_ret" = "xint"; then -+ AC_DEFINE([SPRINTF_RETURNS_INT], [1]) -+ elif test x"$mysql_cv_func_sprintf_ret" = "xptr"; then -+ AC_DEFINE([SPRINTF_RETURNS_PTR], [1]) -+ else -+ AC_DEFINE([SPRINTF_RETURNS_GARBAGE], [1]) -+ fi -+]) -+ -+# _MYSQL_FUNC_ATOMIC_ADD -+# ---------------------- -+# Check for Linux specific atomic_add function -+AC_DEFUN([_MYSQL_FUNC_ATOMIC_ADD], -+[AC_CACHE_CHECK([for atomic_add], [mysql_cv_func_atomic_add], -+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]], -+ [ -+int main() -+{ -+ atomic_t v; -+ -+ atomic_set(&v, 23); -+ atomic_add(5, &v); -+ return atomic_read(&v) == 28 ? 0 : -1; -+} -+ ])], -+ [mysql_cv_func_atomic_add=yes], -+ [mysql_cv_func_atomic_add=no])]) -+ if test x"$mysql_func_atomic_add" = "xyes"; then -+ AC_DEFINE([HAVE_ATOMIC_ADD], [1]) -+ fi[]dnl -+])# _MYSQL_FUNC_ATOMIC_ADD -+ -+# _MYSQL_FUNC_ATOMIC_SUB -+# ---------------------- -+# Check for Linux specific atomic_sub function -+AC_DEFUN([_MYSQL_FUNC_ATOMIC_SUB], -+[AC_CACHE_CHECK([for atomic_sub], [mysql_cv_func_atomic_sub], -+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]], -+ [ -+int main() -+{ -+ atomic_t v; -+ -+ atomic_set(&v, 23); -+ atomic_sub(5, &v); -+ return atomic_read(&v) == 18 ? 0 : -1; -+} -+ ])], -+ [mysql_cv_func_atomic_sub=yes], -+ [mysql_cv_func_atomic_sub=no])]) -+ if test x"$mysql_func_atomic_sub" = "xyes"; then -+ AC_DEFINE([HAVE_ATOMIC_SUB], [1]) -+ fi[]dnl -+])# _MYSQL_FUNC_ATOMIC_SUB -+ -+# MYSQL_FUNCS_ATOMIC -+# ------------------ -+# Check for Linux specific atomic add and sub functions -+AC_DEFUN([MYSQL_FUNCS_ATOMIC], [ -+ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_ADD])dnl -+ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_SUB])dnl -+])# MYSQL_FUNCS_ATOMIC - - AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [ - AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared, -@@ -344,7 +427,7 @@ dnl ------------------------------------ - AC_DEFUN([MYSQL_CHECK_ULONG], - [AC_MSG_CHECKING(for type ulong) - AC_CACHE_VAL(ac_cv_ulong, --[AC_TRY_RUN([#include <stdio.h> -+[AC_TRY_LINK([#include <stdio.h> - #include <sys/types.h> - main() - { -@@ -362,7 +445,7 @@ fi - AC_DEFUN([MYSQL_CHECK_UCHAR], - [AC_MSG_CHECKING(for type uchar) - AC_CACHE_VAL(ac_cv_uchar, --[AC_TRY_RUN([#include <stdio.h> -+[AC_TRY_LINK([#include <stdio.h> - #include <sys/types.h> - main() - { -@@ -380,7 +463,7 @@ fi - AC_DEFUN([MYSQL_CHECK_UINT], - [AC_MSG_CHECKING(for type uint) - AC_CACHE_VAL(ac_cv_uint, --[AC_TRY_RUN([#include <stdio.h> -+[AC_TRY_LINK([#include <stdio.h> - #include <sys/types.h> - main() - { -@@ -399,7 +482,7 @@ fi - AC_DEFUN([MYSQL_CHECK_IN_ADDR_T], - [AC_MSG_CHECKING(for type in_addr_t) - AC_CACHE_VAL(ac_cv_in_addr_t, --[AC_TRY_RUN([#include <stdio.h> -+[AC_TRY_LINK([#include <stdio.h> - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> -@@ -460,7 +543,7 @@ fi - AC_DEFUN([MYSQL_CHECK_FP_EXCEPT], - [AC_MSG_CHECKING(for type fp_except) - AC_CACHE_VAL(ac_cv_fp_except, --[AC_TRY_RUN([#include <stdio.h> -+[AC_TRY_LINK([#include <stdio.h> - #include <sys/types.h> - #include <ieeefp.h> - main() -diff -aurp mysql-4.1.22.old/configure.in mysql-4.1.22/configure.in ---- mysql-4.1.22.old/configure.in 2008-09-18 13:00:14.000000000 -0500 -+++ mysql-4.1.22/configure.in 2008-09-18 12:54:00.000000000 -0500 -@@ -236,8 +236,6 @@ then - else - AC_PATH_PROG(AS, as, as) - fi --# Still need ranlib for readline; local static use only so no libtool. --AC_PROG_RANLIB - # We use libtool - #AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL -@@ -258,44 +256,7 @@ AC_PROG_YACC - AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf) - AC_CHECK_PROG(DVIS, tex, manual.dvi) - --AC_MSG_CHECKING("return type of sprintf") -- --#check the return type of sprintf --case $SYSTEM_TYPE in -- *netware*) -- AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int") -- ;; -- *) --AC_TRY_RUN([ -- int main() -- { -- char* s = "hello"; -- char buf[6]; -- if((int)sprintf(buf, s) == strlen(s)) -- return 0; -- -- return -1; -- } -- ], -- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf]) -- AC_MSG_RESULT("int")], -- [AC_TRY_RUN([ -- int main() -- { -- char* s = "hello"; -- char buf[6]; -- if((char*)sprintf(buf,s) == buf + strlen(s)) -- return 0; -- return -1; -- } ], -- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf]) -- AC_MSG_RESULT("ptr")], -- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf]) -- AC_MSG_RESULT("garbage")]) -- ]) -- ;; --esac -- -+MYSQL_SPRINTF_RET - - # option, cache_name, variable, - # code to execute if yes, code to exectute if fail -@@ -878,47 +839,7 @@ struct request_info *req; - AC_SUBST(WRAPLIBS) - - if test "$TARGET_LINUX" = "true"; then -- AC_MSG_CHECKING([for atomic operations]) -- -- AC_LANG_SAVE -- AC_LANG_CPLUSPLUS -- -- atom_ops= -- AC_TRY_RUN([ --#include <asm/atomic.h> --int main() --{ -- atomic_t v; -- -- atomic_set(&v, 23); -- atomic_add(5, &v); -- return atomic_read(&v) == 28 ? 0 : -1; --} -- ], -- [AC_DEFINE([HAVE_ATOMIC_ADD], [1], -- [atomic_add() from <asm/atomic.h> (Linux only)]) -- atom_ops="${atom_ops}atomic_add "], -- ) -- AC_TRY_RUN([ --#include <asm/atomic.h> --int main() --{ -- atomic_t v; -- -- atomic_set(&v, 23); -- atomic_sub(5, &v); -- return atomic_read(&v) == 18 ? 0 : -1; --} -- ], -- [AC_DEFINE([HAVE_ATOMIC_SUB], [1], -- [atomic_sub() from <asm/atomic.h> (Linux only)]) -- atom_ops="${atom_ops}atomic_sub "], -- ) -- -- if test -z "$atom_ops"; then atom_ops="no"; fi -- AC_MSG_RESULT($atom_ops) -- -- AC_LANG_RESTORE -+ MYSQL_FUNC_ATOMIC - - AC_ARG_WITH(pstack, - [ --with-pstack Use the pstack backtrace library], -@@ -971,13 +892,13 @@ fi - # Later in this script LIBS will be augmented with a threads library. - NON_THREADED_LIBS="$LIBS" - --AC_MSG_CHECKING([for int8]) -+AC_CACHE_CHECK([for int8], [mysql_cv_type_int8], [ - case $SYSTEM_TYPE in - *netware) - AC_MSG_RESULT([no]) - ;; - *) --AC_TRY_RUN([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #ifdef HAVE_STDLIB_H - #include <stdlib.h> - #endif -@@ -988,22 +909,21 @@ AC_TRY_RUN([ - - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> --#endif -- -+#endif]], [ - int main() - { - int8 i; - return 0; --} --], --[AC_DEFINE([HAVE_INT_8_16_32], [1], -- [whether int8, int16 and int32 types exist]) --AC_MSG_RESULT([yes])], --[AC_MSG_RESULT([no])] --) -+}])], [mysql_cv_type_int8=yes], [mysql_cv_type_int8=no]) - ;; - esac - -+if test x"$mysql_cv_type_int8" = "xyes"; then -+ AC_DEFINE([HAVE_INT_8_16_32], [1], -+ [whether int8, int16 and int32 types exist]) -+fi -+]) -+ - # - # Some system specific hacks - # -@@ -1814,7 +1734,7 @@ then - AC_MSG_ERROR("MySQL needs a long long type.") - fi - # off_t is not a builtin type --MYSQL_CHECK_SIZEOF(off_t, 4) -+AC_CHECK_SIZEOF(off_t, 4) - if test "$ac_cv_sizeof_off_t" -eq 0 - then - AC_MSG_ERROR("MySQL needs a off_t type.") -diff -aurp mysql-4.1.22.old/innobase/configure.in mysql-4.1.22/innobase/configure.in ---- mysql-4.1.22.old/innobase/configure.in 2008-09-18 13:00:14.000000000 -0500 -+++ mysql-4.1.22/innobase/configure.in 2008-09-18 12:55:39.000000000 -0500 -@@ -3,6 +3,7 @@ AC_INIT - AC_CANONICAL_SYSTEM - AM_MAINTAINER_MODE - AM_CONFIG_HEADER(ib_config.h) -+AC_CONFIG_AUX_DIR([..]) - AM_INIT_AUTOMAKE(ib, 0.90) - - # This is need before AC_PROG_CC -@@ -32,7 +33,6 @@ CFLAGS="$CFLAGS " - CXXFLAGS="$CXXFLAGS " - - AC_PROG_CC --AC_PROG_RANLIB - AC_PROG_INSTALL - AC_PROG_LIBTOOL - AC_CHECK_HEADERS(aio.h sched.h) diff --git a/recipes-support/mysql/files/configure-ps-cache-check.patch b/recipes-support/mysql/files/configure-ps-cache-check.patch deleted file mode 100644 index 3b5b3fd063..0000000000 --- a/recipes-support/mysql/files/configure-ps-cache-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: mysql-4.1.22/configure.in -=================================================================== ---- mysql-4.1.22.orig/configure.in 2009-01-28 16:33:28.000000000 +0000 -+++ mysql-4.1.22/configure.in 2009-01-28 16:43:26.000000000 +0000 -@@ -471,8 +471,8 @@ - - # Lock for PS - AC_PATH_PROG(PS, ps, ps) --AC_MSG_CHECKING("how to check if pid exists") --PS=$ac_cv_path_PS -+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC], -+[ - # Linux style - if $PS p $$ 2> /dev/null | grep $0 > /dev/null - then -@@ -511,8 +511,9 @@ - AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.]) - esac - fi --AC_SUBST(FIND_PROC) --AC_MSG_RESULT("$FIND_PROC") -+ac_cv_FIND_PROC="$FIND_PROC" -+]) -+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC]) - - # Check if a pid is valid - AC_PATH_PROG(KILL, kill, kill) diff --git a/recipes-support/mysql/files/fix_host_path.patch b/recipes-support/mysql/files/fix_host_path.patch deleted file mode 100644 index 4f69cd5198..0000000000 --- a/recipes-support/mysql/files/fix_host_path.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- mysql-4.1.22/configure.in.old 2008-09-18 20:11:15.000000000 -0500 -+++ mysql-4.1.22/configure.in 2008-09-18 20:12:28.000000000 -0500 -@@ -456,9 +456,9 @@ else - fi - fi - --AC_SUBST(HOSTNAME) --AC_SUBST(PERL) --AC_SUBST(PERL5) -+AC_SUBST(HOSTNAME,/bin/hostname) -+AC_SUBST(PERL,$(bindir)/perl) -+AC_SUBST(PERL5,$(bindir)/perl) - - # for build ndb docs - -@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC") - - # Check if a pid is valid - AC_PATH_PROG(KILL, kill, kill) -+AC_SUBST(KILL,/bin/kill) - AC_MSG_CHECKING("for kill switches") --if $ac_cv_path_KILL -0 $$ -+if $KILL -0 $$ - then -- CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null" -+ CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null" - elif kill -s 0 $$ - then -- CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null" -+ CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null" - else - AC_MSG_WARN([kill -0 to check for pid seems to fail]) -- CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" -+ CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" - fi - AC_SUBST(CHECK_PID) - AC_MSG_RESULT("$CHECK_PID") diff --git a/recipes-support/mysql/files/my.cnf b/recipes-support/mysql/files/my.cnf deleted file mode 100644 index 85560ebf5c..0000000000 --- a/recipes-support/mysql/files/my.cnf +++ /dev/null @@ -1,21 +0,0 @@ -[client] -#password = password -port = 3306 -socket = /tmp/mysql.sock - -[mysqld_safe] -err-log = /var/log/mysql.err - -[mysqld] -user = mysql -port = 3306 -socket = /tmp/mysql.sock -pid-file = /var/lib/mysql/mysqld.pid -log-error = /var/log/mysqld.err -basedir = /usr -datadir = /var/mysql -skip-locking -skip-innodb -skip-networking -bind-address = localhost - diff --git a/recipes-support/mysql/files/mysqld.sh b/recipes-support/mysql/files/mysqld.sh deleted file mode 100644 index 479ebdb257..0000000000 --- a/recipes-support/mysql/files/mysqld.sh +++ /dev/null @@ -1,24 +0,0 @@ -# MySQL init script - -. /etc/default/rcS - -case "$1" in - start) - /usr/bin/mysqld_safe & - ;; - stop) - if test -f /var/lib/mysql/mysqld.pid ; then - PID=`cat /var/lib/mysql/mysqld.pid` - kill $PID - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/mysqld {start|stop|restart}" - ;; -esac - -exit 0 diff --git a/recipes-support/mysql/mysql5-native_5.1.40.bb b/recipes-support/mysql/mysql5-native_5.1.40.bb deleted file mode 100644 index 800178330b..0000000000 --- a/recipes-support/mysql/mysql5-native_5.1.40.bb +++ /dev/null @@ -1,28 +0,0 @@ -require mysql5_${PV}.inc -inherit native -PR ="r2" - -SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ - file://fix-abi-check-gcc45.patch" - -RDEPENDS_${PN} = "" -PACKAGES = "" -DEPENDS = "ncurses-native" -EXTRA_OEMAKE = "" -EXTRA_OECONF = " --with-embedded-server " - -do_install() { - oe_runmake 'DESTDIR=${D}' install - mv -f ${D}${libdir}/mysql/* ${D}${libdir} - rmdir ${D}${libdir}/mysql - - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ -} - -NATIVE_INSTALL_WORKS = "1" - -PSTAGING_DISABLED = "1" - -SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad" -SRC_URI[sha256sum] = "2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432" diff --git a/recipes-support/mysql/mysql5/Makefile.am.patch b/recipes-support/mysql/mysql5/Makefile.am.patch deleted file mode 100644 index 33fd17acd4..0000000000 --- a/recipes-support/mysql/mysql5/Makefile.am.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: mysql-5.1.40/sql/Makefile.am -=================================================================== ---- mysql-5.1.40.orig/sql/Makefile.am -+++ mysql-5.1.40/sql/Makefile.am -@@ -174,10 +174,10 @@ link_sources: - # This generates lex_hash.h - # NOTE Built sources should depend on their sources not the tool - # this avoid the rebuild of the built files in a source dist --lex_hash.h: gen_lex_hash.cc lex.h -- $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT) -- ./gen_lex_hash$(EXEEXT) > $@-t -- $(MV) $@-t $@ -+GEN_LEX_HASH = ./gen_lex_hash$(EXEEXT) -+ -+lex_hash.h: gen_lex_hash$(EXEEXT) -+ $(GEN_LEX_HASH) > $@ - - # For testing of udf_example.so - udf_example_la_SOURCES= udf_example.c diff --git a/recipes-support/mysql/mysql5/configure-ps-cache-check.patch b/recipes-support/mysql/mysql5/configure-ps-cache-check.patch deleted file mode 100644 index 3b5b3fd063..0000000000 --- a/recipes-support/mysql/mysql5/configure-ps-cache-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: mysql-4.1.22/configure.in -=================================================================== ---- mysql-4.1.22.orig/configure.in 2009-01-28 16:33:28.000000000 +0000 -+++ mysql-4.1.22/configure.in 2009-01-28 16:43:26.000000000 +0000 -@@ -471,8 +471,8 @@ - - # Lock for PS - AC_PATH_PROG(PS, ps, ps) --AC_MSG_CHECKING("how to check if pid exists") --PS=$ac_cv_path_PS -+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC], -+[ - # Linux style - if $PS p $$ 2> /dev/null | grep $0 > /dev/null - then -@@ -511,8 +511,9 @@ - AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.]) - esac - fi --AC_SUBST(FIND_PROC) --AC_MSG_RESULT("$FIND_PROC") -+ac_cv_FIND_PROC="$FIND_PROC" -+]) -+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC]) - - # Check if a pid is valid - AC_PATH_PROG(KILL, kill, kill) diff --git a/recipes-support/mysql/mysql5/configure.in.patch b/recipes-support/mysql/mysql5/configure.in.patch deleted file mode 100644 index 3edc5f3c21..0000000000 --- a/recipes-support/mysql/mysql5/configure.in.patch +++ /dev/null @@ -1,54 +0,0 @@ -Index: mysql-5.1.40/configure.in -=================================================================== ---- mysql-5.1.40.orig/configure.in -+++ mysql-5.1.40/configure.in -@@ -226,8 +226,6 @@ else - AC_PATH_PROG(AS, as, as) - fi - --# Still need ranlib for readline; local static use only so no libtool. --AC_PROG_RANLIB - # We use libtool - #AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL -@@ -255,39 +253,7 @@ AC_CHECK_PROGS(YACC, ['bison -y -p MYSQL - AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf) - AC_CHECK_PROG(DVIS, tex, manual.dvi) - --#check the return type of sprintf --AC_MSG_CHECKING("return type of sprintf") --AC_TRY_RUN([ -- int main() -- { -- char* s = "hello"; -- char buf[6]; -- if((int)sprintf(buf, s) == strlen(s)) -- return 0; -- -- return -1; -- } -- ], -- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf]) -- AC_MSG_RESULT("int")], -- [AC_TRY_RUN([ -- int main() -- { -- char* s = "hello"; -- char buf[6]; -- if((char*)sprintf(buf,s) == buf + strlen(s)) -- return 0; -- return -1; -- } ], -- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf]) -- AC_MSG_RESULT("ptr")], -- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf]) -- AC_MSG_RESULT("garbage")] -- )], -- # Cross compile, assume POSIX -- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf]) -- AC_MSG_RESULT("int (we assume)")] --) -+MYSQL_SPRINTF_RET - - AC_PATH_PROG(uname_prog, uname, no) - diff --git a/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch b/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch deleted file mode 100644 index 58812c1f1a..0000000000 --- a/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Date: July 20 2010 7:44pm -Subject: bzr commit into mysql-5.1-bugteam branch (davi:3493) Bug#52514 -List-Archive: http://lists.mysql.com/commits/113968 -X-Bug: 52514 -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="===============9147207462624717749==" - ---===============9147207462624717749== -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit -Content-Disposition: inline - -# At a local mysql-5.1-bugteam repository of davi - - 3493 Davi Arnaut 2010-07-20 - Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5 - due to GCC preprocessor change - - The problem is that newer GCC versions treats missing headers - as fatal errors. The solution is to use a guard macro to prevent - the inclusion of system headers when checking the ABI with the - C Preprocessor. - - Reference: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15638 - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44836 - @ Makefile.am - Define guard macro. - @ configure.in - Remove workaround. - @ include/mysql.h - Guard the header inclusion. - @ include/mysql.h.pp - Header is not included anymore. - - modified: - Makefile.am - configure.in - include/mysql.h - include/mysql.h.pp -=== modified file 'Makefile.am' -Index: mysql-5.1.40/Makefile.am -=================================================================== ---- mysql-5.1.40.orig/Makefile.am 2009-10-07 01:46:13.000000000 +0800 -+++ mysql-5.1.40/Makefile.am 2010-08-17 20:07:24.843148001 +0800 -@@ -312,7 +312,7 @@ - do_abi_check: - set -ex; \ - for file in $(abi_headers); do \ -- @CC@ -E -nostdinc -dI \ -+ @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/mysql \ - -I$(top_srcdir)/sql \ -Index: mysql-5.1.40/include/mysql.h -=================================================================== ---- mysql-5.1.40.orig/include/mysql.h 2009-10-07 01:46:50.000000000 +0800 -+++ mysql-5.1.40/include/mysql.h 2010-08-17 20:07:24.843148001 +0800 -@@ -44,7 +44,9 @@ - #endif - - #ifndef _global_h /* If not standard header */ -+#ifndef MYSQL_ABI_CHECK - #include <sys/types.h> -+#endif - #ifdef __LCC__ - #include <winsock2.h> /* For windows */ - #endif -Index: mysql-5.1.40/include/mysql.h.pp -=================================================================== ---- mysql-5.1.40.orig/include/mysql.h.pp 2009-10-07 01:46:50.000000000 +0800 -+++ mysql-5.1.40/include/mysql.h.pp 2010-08-17 20:07:24.843148001 +0800 -@@ -1,4 +1,3 @@ --#include <sys/types.h> - typedef char my_bool; - typedef int my_socket; - #include "mysql_version.h" diff --git a/recipes-support/mysql/mysql5/fix_host_path.patch b/recipes-support/mysql/mysql5/fix_host_path.patch deleted file mode 100644 index 4f69cd5198..0000000000 --- a/recipes-support/mysql/mysql5/fix_host_path.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- mysql-4.1.22/configure.in.old 2008-09-18 20:11:15.000000000 -0500 -+++ mysql-4.1.22/configure.in 2008-09-18 20:12:28.000000000 -0500 -@@ -456,9 +456,9 @@ else - fi - fi - --AC_SUBST(HOSTNAME) --AC_SUBST(PERL) --AC_SUBST(PERL5) -+AC_SUBST(HOSTNAME,/bin/hostname) -+AC_SUBST(PERL,$(bindir)/perl) -+AC_SUBST(PERL5,$(bindir)/perl) - - # for build ndb docs - -@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC") - - # Check if a pid is valid - AC_PATH_PROG(KILL, kill, kill) -+AC_SUBST(KILL,/bin/kill) - AC_MSG_CHECKING("for kill switches") --if $ac_cv_path_KILL -0 $$ -+if $KILL -0 $$ - then -- CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null" -+ CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null" - elif kill -s 0 $$ - then -- CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null" -+ CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null" - else - AC_MSG_WARN([kill -0 to check for pid seems to fail]) -- CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" -+ CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" - fi - AC_SUBST(CHECK_PID) - AC_MSG_RESULT("$CHECK_PID") diff --git a/recipes-support/mysql/mysql5/misc.m4.patch b/recipes-support/mysql/mysql5/misc.m4.patch deleted file mode 100644 index 7b0acff21c..0000000000 --- a/recipes-support/mysql/mysql5/misc.m4.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mysql-5.1.40/config/ac-macros/misc.m4 -=================================================================== ---- mysql-5.1.40.orig/config/ac-macros/misc.m4 -+++ mysql-5.1.40/config/ac-macros/misc.m4 -@@ -476,7 +476,7 @@ AC_DEFUN([MYSQL_STACK_DIRECTION], - { - exit (find_stack_direction() < 0); - }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1, -- ac_cv_c_stack_direction=)]) -+ ac_cv_c_stack_direction=0)]) - AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) - ])dnl - diff --git a/recipes-support/mysql/mysql5/my.cnf b/recipes-support/mysql/mysql5/my.cnf deleted file mode 100644 index 7f557e4250..0000000000 --- a/recipes-support/mysql/mysql5/my.cnf +++ /dev/null @@ -1,21 +0,0 @@ -[client] -#password = password -port = 3306 -socket = /tmp/mysql.sock - -[mysqld_safe] -err-log = /var/log/mysql.err - -[mysqld] -user = mysql -port = 3306 -socket = /tmp/mysql.sock -pid-file = /var/lib/mysql/mysqld.pid -log-error = /var/log/mysqld.err -basedir = /usr -datadir = /var/mysql -skip-locking -loose-skip-innodb -skip-networking -bind-address = localhost - diff --git a/recipes-support/mysql/mysql5/mysqld.sh b/recipes-support/mysql/mysql5/mysqld.sh deleted file mode 100644 index 479ebdb257..0000000000 --- a/recipes-support/mysql/mysql5/mysqld.sh +++ /dev/null @@ -1,24 +0,0 @@ -# MySQL init script - -. /etc/default/rcS - -case "$1" in - start) - /usr/bin/mysqld_safe & - ;; - stop) - if test -f /var/lib/mysql/mysqld.pid ; then - PID=`cat /var/lib/mysql/mysqld.pid` - kill $PID - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/mysqld {start|stop|restart}" - ;; -esac - -exit 0 diff --git a/recipes-support/mysql/mysql5/plug.in.patch b/recipes-support/mysql/mysql5/plug.in.patch deleted file mode 100644 index 70c39fa7a3..0000000000 --- a/recipes-support/mysql/mysql5/plug.in.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: mysql-5.1.40/storage/innodb_plugin/plug.in -=================================================================== ---- mysql-5.1.40.orig/storage/innodb_plugin/plug.in -+++ mysql-5.1.40/storage/innodb_plugin/plug.in -@@ -63,35 +63,6 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [ - ;; - esac - AC_SUBST(INNODB_DYNAMIC_CFLAGS) -- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins) -- AC_TRY_RUN( -- [ -- #include <pthread.h> -- #include <string.h> -- -- int main(int argc, char** argv) { -- pthread_t x1; -- pthread_t x2; -- pthread_t x3; -- -- memset(&x1, 0x0, sizeof(x1)); -- memset(&x2, 0x0, sizeof(x2)); -- memset(&x3, 0x0, sizeof(x3)); -- -- __sync_bool_compare_and_swap(&x1, x2, x3); -- -- return(0); -- } -- ], -- [ -- AC_DEFINE([HAVE_ATOMIC_PTHREAD_T], [1], -- [pthread_t can be used by GCC atomic builtins]) -- AC_MSG_RESULT(yes) -- ], -- [ -- AC_MSG_RESULT(no) -- ] -- ) - - # Try using solaris atomics on SunOS if GCC atomics are not available - AC_CHECK_DECLS( diff --git a/recipes-support/mysql/mysql5_5.1.40.bb b/recipes-support/mysql/mysql5_5.1.40.bb deleted file mode 100644 index 5229312dce..0000000000 --- a/recipes-support/mysql/mysql5_5.1.40.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${PN}_${PV}.inc - -DEPENDS += mysql5-native - -SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad" -SRC_URI[sha256sum] = "2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432" diff --git a/recipes-support/mysql/mysql5_5.1.40.inc b/recipes-support/mysql/mysql5_5.1.40.inc deleted file mode 100644 index 348f4e38d2..0000000000 --- a/recipes-support/mysql/mysql5_5.1.40.inc +++ /dev/null @@ -1,172 +0,0 @@ -DESCRIPTION = "The MySQL Open Source Database System" -HOMEPAGE = "http://www.mysql.com/" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=477ab0a4c8ca64b482b3f2a365d0fdfa" - -DEPENDS = "ncurses" -PR = "r5" - -SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ - file://configure.in.patch \ - file://plug.in.patch \ - file://misc.m4.patch \ - file://Makefile.am.patch \ - file://fix_host_path.patch \ - file://configure-ps-cache-check.patch \ - file://fix-abi-check-gcc45.patch \ - file://my.cnf \ - file://mysqld.sh" - -S = "${WORKDIR}/mysql-${PV}" - -BINCONFIG_GLOB = "mysql_config" - -inherit autotools binconfig update-rc.d - -INITSCRIPT_PACKAGES = "${PN}-server" -INITSCRIPT_NAME = "mysqld" -INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ." - -export ac_cv_path_PS=/bin/ps -export ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" -PARALLEL_MAKE = " " -EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" -EXTRA_OECONF = " --with-atomic-ops=up --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " - -do_configure_append() { - sed -i /comp_err/d ${S}/sql/share/Makefile -} - -SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" - -# We need to append this so it runs *after* binconfig's preprocess function -mysql5_sysroot_preprocess () { - sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config - sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install - mv -f ${D}${libdir}/mysql/* ${D}${libdir} - rmdir ${D}${libdir}/mysql - - install -d ${D}/etc/init.d - install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/ - install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld -} - -pkg_postinst_mysql5-server () { - if [ "x$D" != "x" ]; then - exit 1 - fi - - grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql - - #Install the database - test -d /usr/bin || mkdir -p /usr/bin - test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname - mkdir /var/lib/mysql - chown mysql.nogroup /var/lib/mysql - - mysql_install_db - -} - -pkg_postrm_mysql5-server () { - grep mysql /etc/passwd && deluser mysql -} - -PACKAGES = "${PN}-dbg ${PN} \ -libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-dbg \ -libmysqlclient libmysqlclient-dev libmysqlclient-dbg \ -${PN}-client ${PN}-server ${PN}-leftovers" -CONFFILES_${PN}-server += "${sysconfdir}/my.cnf" - -FILES_${PN} = " " -RDEPENDS_${PN} = "${PN}-client ${PN}-server" -ALLOW_EMPTY_${PN} = "1" - -FILES_libmysqlclient = "${libdir}/libmysqlclient.so.*" -FILES_libmysqlclient-dev = " \ -${includedir}/mysql/ \ -${libdir}/lib* \ -${libdir}/plugin/* \ -${sysconfdir}/aclocal \ -${bindir}/mysql_config" -FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ -/usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" - -FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" -FILES_libmysqlclient-r-dev = "${libdir}/libmysqlclient_r.*" -FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*" - -FILES_${PN}-client = "\ -${bindir}/myisam_ftdump \ -${bindir}/mysql \ -${bindir}/mysql_client_test \ -${bindir}/mysql_client_test_embedded \ -${bindir}/mysql_find_rows \ -${bindir}/mysql_fix_extensions \ -${bindir}/mysql_waitpid \ -${bindir}/mysqlaccess \ -${bindir}/mysqladmin \ -${bindir}/mysqlbug \ -${bindir}/mysqlcheck \ -${bindir}/mysqldump \ -${bindir}/mysqldumpslow \ -${bindir}/mysqlimport \ -${bindir}/mysqlshow \ -${bindir}/mysqlslap \ -${bindir}/mysqltest_embedded \ -${libexecdir}/mysqlmanager" - -FILES_${PN}-server = "\ -${bindir}/comp_err \ -${bindir}/isamchk \ -${bindir}/isamlog \ -${bindir}/msql2mysql \ -${bindir}/my_print_defaults \ -${bindir}/myisamchk \ -${bindir}/myisamlog \ -${bindir}/myisampack \ -${bindir}/mysql_convert_table_format \ -${bindir}/mysql_fix_privilege_tables \ -${bindir}/mysql_install_db \ -${bindir}/mysql_secure_installation \ -${bindir}/mysql_setpermission \ -${bindir}/mysql_tzinfo_to_sql \ -${bindir}/mysql_upgrade \ -${bindir}/mysql_zap \ -${bindir}/mysqlbinlog \ -${bindir}/mysqld_multi \ -${bindir}/mysqld_safe \ -${bindir}/mysqlhotcopy \ -${bindir}/mysqltest \ -${bindir}/ndb_delete_all \ -${bindir}/ndb_desc \ -${bindir}/ndb_drop_index \ -${bindir}/ndb_drop_table \ -${bindir}/ndb_mgm \ -${bindir}/ndb_restore \ -${bindir}/ndb_select_all \ -${bindir}/ndb_select_count \ -${bindir}/ndb_show_tables \ -${bindir}/ndb_waiter \ -${bindir}/pack_isam \ -${bindir}/perror \ -${bindir}/replace \ -${bindir}/resolve_stack_dump \ -${bindir}/resolveip \ -${libexecdir}/mysqld \ -${sbindir}/mysqld \ -${sbindir}/ndb_cpcd \ -${sbindir}/ndbd \ -${sbindir}/ndb_mgmd \ -${datadir}/mysql/ \ -${localstatedir}/mysql/ \ -${sysconfdir}/init.d \ -${sysconfdir}/my.cnf" - -DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}" -FILES_${PN}-leftovers = "/" diff --git a/recipes-support/ntp/files/hipox/ntp.conf b/recipes-support/ntp/files/hipox/ntp.conf deleted file mode 100644 index 57e585c175..0000000000 --- a/recipes-support/ntp/files/hipox/ntp.conf +++ /dev/null @@ -1,13 +0,0 @@ -# This is the most basic ntp configuration file -# The driftfile must remain in a place specific to this -# machine - it records the machine specific clock error -driftfile /etc/ntp.drift -# This obtains a random server which will be close -# (in IP terms) to the machine. Add other servers -# as required, or change this. -#server pool.ntp.org -# Using local hardware clock as fallback -server 127.127.1.0 -fudge 127.127.1.0 stratum 14 -# Defining a default security setting -restrict default nomodify nopeer diff --git a/recipes-support/ntp/files/hipox/ntpd b/recipes-support/ntp/files/hipox/ntpd deleted file mode 100755 index 7d2cd34cdf..0000000000 --- a/recipes-support/ntp/files/hipox/ntpd +++ /dev/null @@ -1,62 +0,0 @@ -#! /bin/sh -# -# ntpd init.d script for ntpdc from ntp.isc.org -test -x /usr/bin/ntpd -a -r /etc/ntp.conf || exit 0 -# rcS contains TICKADJ -test -r /etc/default/rcS && . /etc/default/rcS - -# Functions to do individual actions -settick(){ - # If TICKADJ is set we *must* adjust it before we start, because the - # driftfile relies on the correct setting - test -n "$TICKADJ" -a -x /usr/bin/tickadj && { - echo -n "Setting tick to $TICKADJ: " - /usr/bin/tickadj "$TICKADJ" - echo "done" - } -} -startdaemon(){ - # The -g option allows ntpd to step the time to correct it just - # once. The daemon will exit if the clock drifts too much after - # this. If ntpd seems to disappear after a while assume TICKADJ - # above is set to a totally incorrect value. - echo -n "Starting ntpd: " - start-stop-daemon --start -x /usr/bin/ntpd -- -p /var/run/ntp.pid "$@" - echo "done" -} -stopdaemon(){ - echo -n "Stopping ntpd: " - start-stop-daemon --stop -p /var/run/ntp.pid - echo "done" -} - -case "$1" in - start) - settick - startdaemon -g -x - ;; - stop) - stopdaemon - ;; - force-reload) - stopdaemon - settick - startdaemon -g -x - ;; - restart) - # Don't reset the tick here - stopdaemon - startdaemon -g -x - ;; - reload) - # Must do this by hand, but don't do -g - stopdaemon - startdaemon -x - ;; - *) - echo "Usage: ntpd { start | stop | restart | reload }" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/recipes-support/ntp/files/ntp b/recipes-support/ntp/files/ntp deleted file mode 100755 index e91a52869a..0000000000 --- a/recipes-support/ntp/files/ntp +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh - -FLAGS="defaults 23" - -test -f /usr/bin/ntpd || exit 0 - -case "$1" in - start) - echo -n "Starting NTP server: ntpd" - start-stop-daemon --start --quiet --exec /usr/bin/ntpd - echo "." - ;; - stop) - echo -n "Stopping NTP server: ntpd" - start-stop-daemon --stop --quiet --exec /usr/bin/ntpd - echo "." - ;; - restart|force-reload) - echo -n "Restarting NTP server: ntpd... " - start-stop-daemon --stop --quiet --exec /usr/bin/ntpd - sleep 2 - start-stop-daemon --start --quiet --exec /usr/bin/ntpd - echo "done." - ;; - *) - echo "Usage: /etc/init.d/ntp {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch b/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch deleted file mode 100644 index cb1e2f7341..0000000000 --- a/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/include/ntp_syscall.h.orig 2009-05-19 16:44:55.048156467 -0400 -+++ b/include/ntp_syscall.h 2009-05-19 16:46:19.293323686 -0400 -@@ -14,6 +14,14 @@ - # include <sys/timex.h> - #endif - -+#if defined(ADJ_NANO) && !defined(MOD_NANO) -+#define MOD_NANO ADJ_NANO -+#endif -+ -+#if defined(ADJ_TAI) && !defined(MOD_TAI) -+#define MOD_TAI ADJ_TAI -+#endif -+ - #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) diff --git a/recipes-support/ntp/files/ntp.conf b/recipes-support/ntp/files/ntp.conf deleted file mode 100644 index 02a44b0d01..0000000000 --- a/recipes-support/ntp/files/ntp.conf +++ /dev/null @@ -1,13 +0,0 @@ -# This is the most basic ntp configuration file -# The driftfile must remain in a place specific to this -# machine - it records the machine specific clock error -driftfile /etc/ntp.drift -# This obtains a random server which will be close -# (in IP terms) to the machine. Add other servers -# as required, or change this. -server pool.ntp.org -# Using local hardware clock as fallback -server 127.127.1.0 -fudge 127.127.1.0 stratum 14 -# Defining a default security setting -restrict default nomodify nopeer diff --git a/recipes-support/ntp/files/ntpd b/recipes-support/ntp/files/ntpd deleted file mode 100755 index ae50f135d0..0000000000 --- a/recipes-support/ntp/files/ntpd +++ /dev/null @@ -1,62 +0,0 @@ -#! /bin/sh -# -# ntpd init.d script for ntpdc from ntp.isc.org -test -x /usr/bin/ntpd -a -r /etc/ntp.conf || exit 0 -# rcS contains TICKADJ -test -r /etc/default/rcS && . /etc/default/rcS - -# Functions to do individual actions -settick(){ - # If TICKADJ is set we *must* adjust it before we start, because the - # driftfile relies on the correct setting - test -n "$TICKADJ" -a -x /usr/bin/tickadj && { - echo -n "Setting tick to $TICKADJ: " - /usr/bin/tickadj "$TICKADJ" - echo "done" - } -} -startdaemon(){ - # The -g option allows ntpd to step the time to correct it just - # once. The daemon will exit if the clock drifts too much after - # this. If ntpd seems to disappear after a while assume TICKADJ - # above is set to a totally incorrect value. - echo -n "Starting ntpd: " - start-stop-daemon --start -x /usr/bin/ntpd -- -p /var/run/ntp.pid "$@" - echo "done" -} -stopdaemon(){ - echo -n "Stopping ntpd: " - start-stop-daemon --stop -p /var/run/ntp.pid - echo "done" -} - -case "$1" in - start) - settick - startdaemon -g - ;; - stop) - stopdaemon - ;; - force-reload) - stopdaemon - settick - startdaemon -g - ;; - restart) - # Don't reset the tick here - stopdaemon - startdaemon -g - ;; - reload) - # Must do this by hand, but don't do -g - stopdaemon - startdaemon - ;; - *) - echo "Usage: ntpd { start | stop | restart | reload }" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/recipes-support/ntp/files/ntpdate b/recipes-support/ntp/files/ntpdate deleted file mode 100755 index 784b029ad5..0000000000 --- a/recipes-support/ntp/files/ntpdate +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -PATH=/sbin:/bin:/usr/bin - -test -x /usr/bin/ntpdate || exit 0 - -if test -f /etc/default/ntpdate ; then -. /etc/default/ntpdate -else -NTPSERVERS="pool.ntp.org" -fi - -test -n "$NTPSERVERS" || exit 0 - -# This is a heuristic: The idea is that if a static interface is brought -# up, that is a major event, and we can put in some extra effort to fix -# the system time. Feel free to change this, especially if you regularly -# bring up new network interfaces. -if [ "$METHOD" = static ]; then - OPTS="-b" -fi - -if [ "$METHOD" = loopback ]; then - exit 0 -fi - -( - -LOCKFILE=/var/lock/ntpdate - -# Avoid running more than one at a time -if [ -x /usr/bin/lockfile-create ]; then - lockfile-create $LOCKFILE - lockfile-touch $LOCKFILE & - LOCKTOUCHPID="$!" -fi - -if /usr/bin/ntpdate -s $OPTS $NTPSERVERS 2>/dev/null; then - if [ "$UPDATE_HWCLOCK" = "yes" ]; then - hwclock --systohc || : - fi -fi - -if [ -x /usr/bin/lockfile-create ] ; then - kill $LOCKTOUCHPID - lockfile-remove $LOCKFILE -fi - -) & diff --git a/recipes-support/ntp/files/tickadj.c.patch b/recipes-support/ntp/files/tickadj.c.patch deleted file mode 100644 index 9ef9de9e1f..0000000000 --- a/recipes-support/ntp/files/tickadj.c.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: ntp-4.2.2p3-r0/ntp-4.2.2p3/util/tickadj.c -=================================================================== ---- ntp-4.2.2p3/util/tickadj.c 2004-02-25 06:58:33.000000000 +0100 -+++ ntp-4.2.2p3/util/tickadj.c 2007-07-07 01:00:54.000000000 +0200 -@@ -21,7 +21,8 @@ - # include <unistd.h> - #endif /* HAVE_UNISTD_H */ - --#ifdef HAVE___ADJTIMEX /* Linux */ -+/* proper handling here has been moved to upstream ntp bugzilla */ -+#ifdef linux - - #include <sys/timex.h> - struct timex txc; -@@ -91,7 +92,7 @@ - } - - if (!errflg) { -- if (__adjtimex(&txc) < 0) -+ if (adjtimex(&txc) < 0) - perror("adjtimex"); - else if (!quiet) - printf("tick = %ld\ntick_adj = %d\n", -@@ -146,7 +147,7 @@ - #endif - } - -- if (__adjtimex(&txc) < 0) -+ if (adjtimex(&txc) < 0) - { - perror("adjtimex"); - } diff --git a/recipes-support/ntp/ntp-ssl_4.2.6p3.bb b/recipes-support/ntp/ntp-ssl_4.2.6p3.bb deleted file mode 100644 index a158990792..0000000000 --- a/recipes-support/ntp/ntp-ssl_4.2.6p3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ntp_${PV}.bb -DEPENDS = "openssl" - -S = "${WORKDIR}/ntp-${PV}" - -EXTRA_OECONF = "--with-openssl-libdir=${STAGING_LIBDIR} \ - --with-openssl-incdir=${STAGING_INCDIR}/openssl" - - -SRC_URI[md5sum] = "98e16c7aa4ecd4c004b51bff18962e95" -SRC_URI[sha256sum] = "9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a" diff --git a/recipes-support/ntp/ntp.inc b/recipes-support/ntp/ntp.inc deleted file mode 100644 index c72e40e79c..0000000000 --- a/recipes-support/ntp/ntp.inc +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "The Network Time Protocol (NTP) is used to \ -synchronize the time of a computer client or server to \ -another server or reference time source, such as a radio \ -or satellite receiver or modem." -HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome" -SECTION = "console/network" -PRIORITY = "optional" -LICENSE = "ntp" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fea4b50c33b18c2194b4b1c9ca512670" -RSUGGESTS_${PN} = "iana-etc" - -SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ - file://ipv6only-workaround.patch \ - file://ntpd \ - file://ntp.conf \ - file://ntpdate" - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "ntpd" -# No dependencies, so just go in at the standard level (20) -INITSCRIPT_PARAMS = "defaults" - -# The ac_cv_header_readline_history is to stop ntpdc depending on either -# readline or curses -EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no" -CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" - -PACKAGES += "ntpdate ${PN}-bin ${PN}-tickadj ${PN}-utils" -# NOTE: you don't need ntpdate, use "ntpdc -q -g -x" - -# This should use rc.update -FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate" diff --git a/recipes-support/ntp/ntp_4.2.6p3.bb b/recipes-support/ntp/ntp_4.2.6p3.bb deleted file mode 100644 index f64f6f6d92..0000000000 --- a/recipes-support/ntp/ntp_4.2.6p3.bb +++ /dev/null @@ -1,46 +0,0 @@ -require ntp.inc - -PR = "r1" - -SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ - file://tickadj.c.patch \ - file://ntp-4.2.4_p6-nano.patch \ - file://ntpd \ - file://ntp.conf \ - file://ntpdate" - -SRC_URI[md5sum] = "59876a9009b098ff59767ee45a88ebd2" -SRC_URI[sha256sum] = "6e84d4ddfa14b911c3ed88463af10867e1fa9b287e7b34d8a02e78be85a7c40e" - -EXTRA_OECONF += " --with-net-snmp-config=no --without-ntpsnmpd" - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir} - install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d - install -d ${D}/${sysconfdir}/network/if-up.d - install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d -} - -FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace" -FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd" -FILES_${PN}-tickadj = "${bindir}/tickadj" -FILES_ntp-utils = "${bindir}/*" -FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate" - -# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms -# with wonky clocks (e.g. OpenSlug) -RDEPENDS_${PN} = "${PN}-tickadj" - -pkg_postinst_ntpdate() { -if test "x$D" != "x"; then - exit 1 -else - if ! grep -q -s ntpdate /var/spool/cron/root; then - echo "adding crontab" - test -d /var/spool/cron || mkdir -p /var/spool/cron - echo "30 * * * * /usr/bin/ntpdate -b -s -u pool.ntp.org" >> /var/spool/cron/root - fi -fi -} - diff --git a/recipes-support/postgresql/files/no-ecpg-test.patch b/recipes-support/postgresql/files/no-ecpg-test.patch deleted file mode 100644 index c0f28f4258..0000000000 --- a/recipes-support/postgresql/files/no-ecpg-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile -index dcd578f..1428423 100644 ---- a/src/interfaces/ecpg/Makefile -+++ b/src/interfaces/ecpg/Makefile -@@ -8,7 +8,6 @@ all install installdirs uninstall dep depend distprep: - $(MAKE) -C ecpglib $@ - $(MAKE) -C compatlib $@ - $(MAKE) -C preproc $@ -- $(MAKE) -C test $@ - - clean distclean maintainer-clean: - -$(MAKE) -C include $@ diff --git a/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch b/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch deleted file mode 100644 index d027061d89..0000000000 --- a/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: postgresql-8.4.4/configure.in -=================================================================== ---- postgresql-8.4.4.orig/configure.in -+++ postgresql-8.4.4/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un - - AC_INIT([PostgreSQL], [8.4.4], [pgsql-bugs@postgresql.org]) - --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then --your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) diff --git a/recipes-support/postgresql/postgresql.inc b/recipes-support/postgresql/postgresql.inc deleted file mode 100644 index edad3bcc5b..0000000000 --- a/recipes-support/postgresql/postgresql.inc +++ /dev/null @@ -1,66 +0,0 @@ -DESCRIPTION = "PostgreSQL is a powerful, open source relational database system." -HOMEPAGE = "http://www.postgresql.com" -LICENSE = "BSD" - -DEPENDS = "zlib readline tzcode-native" - -ARM_INSTRUCTION_SET = "arm" - -#WARNING: this recipe assumes you have the timezone compiler present in /usr/sbin/zic - -SRC_URI = "ftp://ftp-archives.postgresql.org/pub/source/v${PV}/${P}.tar.bz2" - -LEAD_SONAME = "libpq.so" - -# LDFLAGS for shared libraries -export LDFLAGS_SL = "${LDFLAGS}" - -inherit autotools pkgconfig - -do_compile_append() { - cp /usr/sbin/zic ${S}/src/timezone/ -} - -PACKAGES =+ "${PN}-client ${PN}-server-dev ${PN}-timezone \ - libecpg-compat-dbg libecpg-compat \ - libecpg-dbg libecpg libecpg-dev \ - libpq-dbg libpq libpq-dev \ - libpgtypes-dbg libpgtypes " - -FILES_${PN}-client = "${bindir}/clusterdb \ - ${bindir}/createdb \ - ${bindir}/createlang \ - ${bindir}/createuser \ - ${bindir}/dropdb \ - ${bindir}/droplang \ - ${bindir}/dropuser \ - ${bindir}/pg_dump \ - ${bindir}/pg_dumpall \ - ${bindir}/pg_restore \ - ${bindir}/psql \ - ${bindir}/reindexdb \ - ${bindir}/vacuumdb \ - ${bindir}/vacuumlo \ - ${datadir}/${PN}/psqlrc.sample" - -FILES_${PN}-doc += "${prefix}/doc/" -FILES_${PN}-timezone = "${datadir}/${PN}/timezone" -FILES_${PN}-server-dev = "${includedir}/${PN}/server" - -FILES_libecpg = "${libdir}/libecpg*.so.*" -FILES_libecpg-dbg = "${libdir}/.debug/libecpg*" -FILES_libecpg-dev = "${libdir}/libecpg*.a ${libdir}/libecpg*.so \ - ${libdir}/libpgtypes*.a ${libdir}/libpgtypes*.so \ - ${includedir}/ecpg*.h ${includedir}/${PN}/ecpg*.h \ - ${includedir}/pgtypes*.h ${includedir}/${PN}/informix \ - ${includedir}/sql3types.h ${includedir}/sqlca.h" - -FILES_libpq = "${libdir}/libpq*.so.*" -FILES_libpq-dbg = "${libdir}/.debug/libpq* ${libdir}/${PN}/pgxs/src/test/regress/.debug/*" -FILES_libpq-dev = "${libdir}/libpq*.a ${libdir}/libpq*.so ${libdir}/libpgport.a \ - ${includedir}" - -FILES_libecpg-compat = "${libdir}/libecpg_compat*.so.*" -FILES_libecpg-compat-dbg = "${libdir}/.debug/libecpg_compat*" -FILES_libpgtypes = "${libdir}/libpgtypes*.so.*" -FILES_libpgtypes-dbg = "${libdir}/.debug/libpgtypes*" diff --git a/recipes-support/postgresql/postgresql_8.4.4.bb b/recipes-support/postgresql/postgresql_8.4.4.bb deleted file mode 100644 index d0f5078498..0000000000 --- a/recipes-support/postgresql/postgresql_8.4.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=29b81b066680be9ffd98cb9d2afb9de6" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.postgresql.org/pub/source/v${PV}/${P}.tar.bz2 \ - file://remove.autoconf.version.check.patch" - -SRC_URI[md5sum] = "4bf2448ad965bca3940df648c02194df" -SRC_URI[sha256sum] = "e66b398d565f7fb16d8ae58ae72881dcd3dbb1b88f532bbe1c2d1284812be37e" diff --git a/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch b/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch deleted file mode 100644 index 914422f1df..0000000000 --- a/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -urN sqlite-2.8.17.orig/main.mk sqlite-2.8.17/main.mk ---- sqlite-2.8.17.orig/main.mk 2005-04-23 22:43:23.000000000 +0000 -+++ sqlite-2.8.17/main.mk 2009-04-02 20:10:36.000000000 +0000 -@@ -139,7 +139,7 @@ - # This is the default Makefile target. The objects listed here - # are what get build when you type just "make" with no arguments. - # --all: sqlite.h config.h libsqlite.a sqlite$(EXE) -+all: sqlite.h config.h libsqlite.so sqlite$(EXE) - - # Generate the file "last_change" which contains the date of change - # of the most recently modified source code file -@@ -148,13 +148,12 @@ - cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \ - | awk '{print $$5,$$6}' >last_change - --libsqlite.a: $(LIBOBJ) -- $(AR) libsqlite.a $(LIBOBJ) -- $(RANLIB) libsqlite.a -- --sqlite$(EXE): $(TOP)/src/shell.c libsqlite.a sqlite.h -- $(TCCX) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ -- libsqlite.a $(LIBREADLINE) $(THREADLIB) -+libsqlite.so: $(LIBOBJ) -+ $(CC) $(LDFLAGS) -shared -o libsqlite.so -Wl,-soname,libsqlite.so.0 $(LIBOBJ) -+ -+sqlite$(EXE): $(TOP)/src/shell.c libsqlite.so sqlite.h -+ $(TCCX) $(LDFLAGS) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ -+ -lsqlite $(LIBREADLINE) $(THREADLIB) - - sqlite_analyzer$(EXE): $(TOP)/src/tclsqlite.c libsqlite.a $(TESTSRC) \ - $(TOP)/tool/spaceanal.tcl diff --git a/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch b/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch deleted file mode 100644 index b84b6486ef..0000000000 --- a/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -bur sqlite-2.8.17~orig/main.mk sqlite-2.8.17/main.mk ---- sqlite-2.8.17~orig/main.mk 2006-02-13 04:09:33.000000000 -0600 -+++ sqlite-2.8.17/main.mk 2006-02-13 04:15:42.000000000 -0600 -@@ -58,7 +58,7 @@ - expr.o func.o hash.o insert.o \ - main.o opcodes.o os.o pager.o parse.o pragma.o printf.o random.o \ - select.o table.o tokenize.o trigger.o update.o util.o \ -- vacuum.o vdbe.o vdbeaux.o where.o tclsqlite.o -+ vacuum.o vdbe.o vdbeaux.o where.o - - # All of the source code files. - # -@@ -91,7 +91,6 @@ - $(TOP)/src/sqlite.h.in \ - $(TOP)/src/sqliteInt.h \ - $(TOP)/src/table.c \ -- $(TOP)/src/tclsqlite.c \ - $(TOP)/src/tokenize.c \ - $(TOP)/src/trigger.c \ - $(TOP)/src/update.c \ diff --git a/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc b/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc deleted file mode 100644 index 6bc742eecb..0000000000 --- a/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc +++ /dev/null @@ -1,12 +0,0 @@ -# Package Information for pkg-config - -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: SQLite -Description: SQL database engine -Version: 2.8.17 -Libs: -L${libdir} -lsqlite -Cflags: -I${includedir} diff --git a/recipes-support/sqlite/sqlite_2.8.17.bb b/recipes-support/sqlite/sqlite_2.8.17.bb deleted file mode 100644 index 75678f6292..0000000000 --- a/recipes-support/sqlite/sqlite_2.8.17.bb +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "An Embeddable SQL Database Engine" -HOMEPAGE = "http://www.sqlite.org/" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "readline ncurses" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=10;md5=e98469a8efa024a38ad5b2e4b92f4a96" - -PR = "r7" - -SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ - file://mainmk_build_dynamic.patch \ - file://mainmk_no_tcl.patch \ - file://sqlite.pc" - -SOURCES = "attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \ - expr.o func.o hash.o insert.o main.o opcodes.o os.o pager.o \ - parse.o pragma.o printf.o random.o select.o table.o tokenize.o \ - trigger.o update.o util.o vacuum.o vdbe.o vdbeaux.o where.o" - -inherit autotools pkgconfig - -do_configure() { - echo "main.mk is patched, no need to configure" - # make pkgconfig.bbclass pick this up - mv ${WORKDIR}/sqlite.pc ${S} -} - -do_compile() { - oe_runmake -f Makefile.linux-gcc \ - TOP="${S}" \ - BCC="${BUILD_CC}" \ - TCC="${CC}" \ - OPTS="-fPIC -D'INTPTR_TYPE=int'" \ - TCL_FLAGS= LIBTCL= \ - READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \ - LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses" -} - -do_install() { - install -d ${D}${libdir} ${D}${bindir} - install sqlite ${D}${bindir} - install -m 0755 libsqlite.so ${D}${libdir}/libsqlite.so.0.8.6 - ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so - ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0 - ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0.8 - install -d ${D}${includedir} - install -m 0644 sqlite.h ${D}${includedir}/sqlite.h - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${S}/sqlite.pc ${D}${libdir}/pkgconfig/sqlite.pc -} - -PACKAGES += "${PN}-bin" -FILES_${PN}-bin = "${bindir}/*" -FILES_${PN} = "${libdir}/*.so.*" - -SRC_URI[md5sum] = "838dbac20b56d2c4292e98848505a05b" -SRC_URI[sha256sum] = "3f35ebfb67867fb5b583a03e480f900206af637efe7179b32294a6a0cf806f37" - -BBCLASSEXTEND = "native" |