diff options
31 files changed, 686 insertions, 205 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 69594e61ba..089cf6e67c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,4 +1,4 @@ -OpenEmbedded Maintainers List +OpenEmbedded Maintainers List Please put you full name and email-address here for the areas of OE you want to support. @@ -86,6 +86,12 @@ Recipes: quagga, iputils, ndic6, hping2, lilo-sh, conserver, ipsec-tools, Recipes: lilo-sh, clamav, havp, p3scan, clamsmtp, librsync, rdiff-backup, Recipes: net-snmp, ebtables, ethtool, arpwatch, lib*-perl +Person: Jan Luebbe +Mail: jluebbe@lasnet.de +Website: http://sicherheitsschwankung.de +Machines: chumby +Recipes: chumby-*, initramfs-chumby + Person: Joaquim Duran Mail: joaquinduran@adtelecom.es Recipes: gtk+, gtkmm diff --git a/classes/efl_base.bbclass b/classes/efl_base.bbclass index 3865441779..023b2edf74 100644 --- a/classes/efl_base.bbclass +++ b/classes/efl_base.bbclass @@ -3,7 +3,7 @@ inherit autotools pkgconfig SECTION = "e/libs" HOMEPAGE = "http://www.enlightenment.org" SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}" -SRC_URI = "http://download.enlightenment.org/snapshots/2007-07-10/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "http://download.enlightenment.org/snapshots/2008-01-25/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" do_stage() { diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index cff6d7316b..aaf7b02a09 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20080117" +EFL_SRCDATE = "20080129" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -107,9 +107,9 @@ SRCDATE_entice ?= "${EFL_SRCDATE}" SRCDATE_entrance ?= "${EFL_SRCDATE}" SRCDATE_e-utils ?= "${EFL_SRCDATE}" SRCDATE_e-wm ?= "${EFL_SRCDATE}" -SRCDATE_enna = "${EFL_SRCDATE}" -#SRCDATE_enna ?= "${EFL_SRCDATE}" +SRCDATE_enna ?= "${EFL_SRCDATE}" SRCDATE_exquisite ?= "${EFL_SRCDATE}" +SRCDATE_rage ?= "${EFL_SRCDATE}" # Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" diff --git a/packages/bluez/bluez-utils-3.24/.mtn2git_empty b/packages/bluez/bluez-utils-3.24/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/bluez/bluez-utils-3.24/.mtn2git_empty diff --git a/packages/bluez/bluez-utils-3.24/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.24/hciattach-ti-bts.patch new file mode 100644 index 0000000000..1b208f7979 --- /dev/null +++ b/packages/bluez/bluez-utils-3.24/hciattach-ti-bts.patch @@ -0,0 +1,477 @@ +--- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200 ++++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200 +@@ -60,6 +60,8 @@ + #define HCI_UART_3WIRE 2 + #define HCI_UART_H4DS 3 + ++#include "ti_bts.h" ++ + struct uart_t { + char *type; + int m_id; +@@ -70,6 +72,7 @@ + int flags; + char *bdaddr; + int (*init) (int fd, struct uart_t *u, struct termios *ti); ++ char *bts; /* bluetooth script */ + }; + + #define FLOW_CTL 0x0001 +@@ -279,6 +282,114 @@ + return 0; + } + ++static int brf6150(int fd, struct uart_t *u, struct termios *ti) ++{ ++ bts_t *bfp; ++ int i; ++ unsigned long vers; ++ unsigned char actionbuf[256]; ++ unsigned char resp[128]; /* Response */ ++ unsigned long count; ++ unsigned short atype; ++ ++ if (u->bts == NULL) /* no script, ignore */ ++ return 0; ++ ++ bfp = bts_load_script( u->bts, &vers ); ++ if (bfp == NULL) ++ return -1; ++ ++ fprintf( stderr, "Loading BTS script version %lu\n", vers ); ++ ++ while ((count = bts_next_action( bfp, actionbuf, ++ sizeof actionbuf - 1, &atype )) != 0) { ++ if (atype == ACTION_REMARKS) { ++ if (actionbuf[0] != 0) ++ fprintf( stderr, "%s\n", actionbuf ); ++ } ++ else if (atype == ACTION_SEND_COMMAND) { ++#if 0 ++ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype ); ++ for (i=0; i<count; i++) { ++ fprintf( stderr, "0x%02x ", actionbuf[i] ); ++ } ++ fprintf( stderr, "\n" ); ++#endif ++ int n; ++ n = write(fd, actionbuf, count); ++ if (n < 0 || n < count) { ++ perror("Failed to write TI action command"); ++ return -1; ++ } ++ } ++ else if (atype == ACTION_WAIT_EVENT) { ++ action_wait_t *wait = (action_wait_t *)actionbuf; ++#if 0 ++ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size ); ++ for (i=0; i<wait->size; i++) { ++ fprintf( stderr, "0x%02x ", wait->data[i] ); ++ } ++ fprintf( stderr, "\n" ); ++#endif ++ usleep(wait->msec); /* seems they give usec, not msec */ ++ /* Read reply. */ ++ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) { ++ perror("Failed to read TI command response"); ++ return -1; ++ } ++ if (count < wait->size) { ++ fprintf( stderr, "TI command response is short."); ++ } ++ for (i=0; i<wait->size; i++) { ++ if (i == 3) continue; /* ignore */ ++ if (resp[i] != wait->data[i]) { ++ fprintf( stderr, "TI command response does not match expected result.\n" ); ++ } ++ } ++ } ++ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) { ++ action_serial_t *sercmd = (action_serial_t *)actionbuf; ++ ++ /* Set actual baudrate */ ++ fprintf( stderr, ++ "BTS changing baud rate to %u, flow control to %u\n", ++ sercmd->baud, sercmd->flow_control ); ++ ++ tcflush(fd, TCIOFLUSH); ++ ++ if (sercmd->flow_control) ++ ti->c_cflag |= CRTSCTS; ++ else ++ ti->c_cflag &= ~CRTSCTS; ++ if (tcsetattr(fd, TCSANOW, ti) < 0) { ++ perror("Can't set port settings"); ++ return -1; ++ } ++ ++ u->speed = sercmd->baud; ++ ++ tcflush(fd, TCIOFLUSH); ++ if (set_speed(fd, ti, sercmd->baud) < 0) { ++ perror("Can't set baud rate"); ++ return -1; ++ } ++ } ++ else if (atype == ACTION_DELAY) { ++ action_delay_t *delay = (action_delay_t *)actionbuf; ++ usleep(delay->msec); /* seems they give usec, not msec */ ++ } ++ else { ++ fprintf( stderr, "BTS action type = %d: ", (int)atype ); ++ for (i=0; i<count; i++) { ++ fprintf( stderr, "0x%02x ", actionbuf[i] ); ++ } ++ fprintf( stderr, "\n" ); ++ } ++ } ++ bts_unload_script( bfp ); ++ return 0; ++} ++ + static int texas(int fd, struct uart_t *u, struct termios *ti) + { + struct timespec tm = {0, 50000}; +@@ -328,6 +439,17 @@ + /* Print LMP subversion */ + fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF); + ++ if ((resp[14] >> 2) == 3) { ++ /* BRF6150 */ ++ int err; ++ ++ nanosleep(&tm, NULL); ++ if ((err = brf6150(fd, u, ti)) != 0) { ++ fprintf(stderr, "Texas module script failed (err=%d)\n", err); ++ return -1; ++ } ++ } ++ + nanosleep(&tm, NULL); + return 0; + } +@@ -1204,7 +1326,7 @@ + { + printf("hciattach - HCI UART driver initialization utility\n"); + printf("Usage:\n"); +- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n"); ++ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n"); + printf("\thciattach -l\n"); + } + +@@ -1219,11 +1341,12 @@ + struct sigaction sa; + struct pollfd p; + char dev[PATH_MAX]; ++ char *bts = NULL; + + detach = 1; + printpid = 0; + +- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) { ++ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) { + switch(opt) { + case 'b': + send_break = 1; +@@ -1245,6 +1368,10 @@ + init_speed = atoi(optarg); + break; + ++ case 'S': ++ bts = optarg; ++ break; ++ + case 'l': + for (i = 0; uart[i].type; i++) { + printf("%-10s0x%04x,0x%04x\n", uart[i].type, +@@ -1320,6 +1447,8 @@ + if (init_speed) + u->init_speed = init_speed; + ++ u->bts = bts; ++ + memset(&sa, 0, sizeof(sa)); + sa.sa_flags = SA_NOCLDSTOP; + sa.sa_handler = sig_alarm; +--- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200 ++++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200 +@@ -0,0 +1,116 @@ ++/* ++ * Copyright (c) 2005 Texas Instruments, Inc. ++ * Ported by SDG Systems, LLC ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation; ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. ++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY ++ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, ++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS ++ * SOFTWARE IS DISCLAIMED. ++ * ++ */ ++ ++#ifndef BT_SCRIPT_H ++#define BT_SCRIPT_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* ++ * Define the interface of Bluetooth Script ++ */ ++ ++typedef void bts_t; ++ ++ ++#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */ ++#define ACTION_WAIT_EVENT 2 /* Wait for data */ ++#define ACTION_SERIAL_PORT_PARAMETERS 3 ++#define ACTION_DELAY 4 ++#define ACTION_RUN_SCRIPT 5 ++#define ACTION_REMARKS 6 ++ ++/* ++ * Structure for ACTION_SEND_COMMAND ++ */ ++typedef struct tagCActionCommand ++{ ++ unsigned char data[1]; /* Data to send */ ++} action_command_t; ++ ++/* ++ * Structure for ACTION_WAIT_EVENT ++ */ ++typedef struct tagCActionWaitEvent ++{ ++ unsigned long msec; /* in milliseconds */ ++ unsigned long size; ++ unsigned char data[1]; /* Data to wait for */ ++} action_wait_t; ++ ++ ++/* ++ * Structure for ACTION_SERIAL_PORT_PARAMETERS ++ */ ++typedef struct tagCActionSerialPortParameters ++{ ++ unsigned long baud; ++ unsigned long flow_control; ++} action_serial_t; ++ ++/* Flow Control Type */ ++#define FCT_NONE 0 ++#define FCT_HARDWARE 1 ++ ++#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */ ++ ++ ++/* ++ * Structure for ACTION_DELAY ++ */ ++typedef struct tagCActionDelay ++{ ++ unsigned long msec; /* in milliseconds */ ++} action_delay_t; ++ ++/* ++ * Structure for ACTION_RUN_SCRIPT ++ */ ++typedef struct tagCActionRunScript ++{ ++ char filename[1]; ++} action_run_t; ++ ++/* ++ * Structure for ACTION_REMARKS ++ */ ++typedef struct tagCActionRemarks ++{ ++ char m_szRemarks[1]; ++} action_remarks_t; ++ ++ ++const char *cis_create_filename(const unsigned char* cmdparms); ++bts_t * bts_load_script(const char* fname, unsigned long* version); ++unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, ++ unsigned long nMaxSize, unsigned short* ptype); ++void bts_unload_script(bts_t* bts_fp); ++ ++#ifdef __cplusplus ++}; ++#endif ++ ++#endif /* BT_SCRIPT_H */ ++ +--- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200 ++++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200 +@@ -0,0 +1,149 @@ ++/* ++ * Copyright (c) 2005 Texas Instruments, Inc. ++ * Ported by SDG Systems, LLC ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation; ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. ++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY ++ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, ++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS ++ * SOFTWARE IS DISCLAIMED. ++ * ++ */ ++ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include "ti_bts.h" ++ ++#ifndef MAKEWORD ++#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8)) ++#endif ++ ++#define TI_MANUFACTURER_ID 13 ++ ++/* ++ * Common Init Script specific ++ */ ++const char * ++cis_create_filename(const unsigned char* cmdparms) ++{ ++ static char bts_file[50]; ++ ++ /* Check for TI's id */ ++ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]); ++ ++ if (TI_MANUFACTURER_ID == manfid) { ++ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]); ++ ++ unsigned short chip = (version & 0x7C00) >> 10; ++ unsigned short min_ver = (version & 0x007F); ++ unsigned short maj_ver = (version & 0x0380) >> 7; ++ ++ if (0 != (version & 0x8000)) { ++ maj_ver |= 0x0008; ++ } ++ ++ sprintf( bts_file, "TIInit_%d.%d.%d.bts", ++ (int)chip, (int)maj_ver, (int)min_ver); ++ ++ return &bts_file[0]; ++ } ++ return NULL; ++} ++ ++typedef struct tagCHeader ++{ ++ unsigned long magic; ++ unsigned long version; ++ unsigned char future[24]; ++} cheader_t; ++ ++ ++/* The value 0x42535442 stands for (in ASCII) BTSB */ ++/* which is Bluetooth Script Binary */ ++#define FILE_HEADER_MAGIC 0x42535442 ++ ++ ++bts_t * ++bts_load_script(const char* fname, unsigned long* version) ++{ ++ bts_t* bts = NULL; ++ FILE* fp = fopen(fname, "rb"); ++ ++ if (NULL != fp) { ++ /* Read header */ ++ cheader_t header; ++ ++ /* Read header */ ++ if (1 == fread(&header, sizeof(header), 1, fp)) { ++ /* Check magic number for correctness */ ++ if (header.magic == FILE_HEADER_MAGIC) { ++ /* If user wants the version number */ ++ if (NULL != version) { ++ *version = header.version; ++ } ++ bts = (bts_t*)fp; ++ } ++ } ++ /* If failed reading the file, close it */ ++ if (NULL == bts) { ++ fclose(fp); ++ } ++ } ++ return bts; ++} ++ ++unsigned long ++bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, ++ unsigned long nMaxSize, unsigned short* ptype) ++{ ++ unsigned long bytes = 0; ++ FILE* fp = (FILE*)bts_fp; ++ unsigned char action_hdr[4]; ++ ++ if (bts_fp == NULL) ++ return 0; ++ ++ /* Each Action has the following: */ ++ /* UINT16 type of this action */ ++ /* UINT16 size of rest */ ++ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */ ++ ++ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) { ++ unsigned short type = *(unsigned short*)&action_hdr[0]; ++ unsigned short size = *(unsigned short*)&action_hdr[2]; ++ ++ if (size <= nMaxSize) { ++ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp); ++ ++ if (nread == size) { ++ *ptype = type; ++ bytes = (unsigned long)size; ++ } ++ } ++ } ++ ++ return bytes; ++} ++ ++void ++bts_unload_script(bts_t* bts_fp) ++{ ++ FILE* fp = (FILE*)bts_fp; ++ ++ if (NULL != fp) { ++ fclose(fp); ++ } ++} ++ +--- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200 ++++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200 +@@ -45,7 +45,7 @@ + + noinst_PROGRAMS = hcisecfilter ppporc + +-hciattach_SOURCES = hciattach.c hciattach_st.c ++hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c + hciattach_LDADD = @BLUEZ_LIBS@ + + hciconfig_SOURCES = hciconfig.c csr.h csr.c diff --git a/packages/chumby/.mtn2git_empty b/packages/chumby/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/chumby/.mtn2git_empty diff --git a/packages/chumby/chumby-firmware_1.2.bb b/packages/chumby/chumby-firmware_1.2.bb new file mode 100644 index 0000000000..73e3a4a7a9 --- /dev/null +++ b/packages/chumby/chumby-firmware_1.2.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Binary Chumby firmware for kexec" +PACKAGES = "${PN}-k2 ${PN}-rfs2 ${PN}-bl ${PN}-psp ${PN}-k1 ${PN}-rfs1" +PR = "r1" + +SRC_URI = "http://files.chumby.com/resources/chumby_fw_1_2.zip" +S = ${WORKDIR} + +PACKAGE_ARCH = "chumby" +COMPATIBLE_MACHINES = "chumby" + +do_install () { + cd ${S}/update1 && unzip k2.bin.zip + cd ${S}/update1 && unzip rfs2.bin.zip + cd ${S}/update2 && unzip bl.bin.zip + cd ${S}/update2 && unzip psp.bin.zip + cd ${S}/update2 && unzip k1.bin.zip + cd ${S}/update2 && unzip rfs1.bin.zip + + install -d ${D}/boot/chumby-firmware/ + install -m 0644 ${S}/update1/k2.bin ${D}/boot/chumby-firmware/ + install -m 0644 ${S}/update1/rfs2.bin ${D}/boot/chumby-firmware/ + install -m 0644 ${S}/update2/bl.bin ${D}/boot/chumby-firmware/ + install -m 0644 ${S}/update2/psp.bin ${D}/boot/chumby-firmware/ + install -m 0644 ${S}/update2/k1.bin ${D}/boot/chumby-firmware/ + install -m 0644 ${S}/update2/rfs1.bin ${D}/boot/chumby-firmware/ +} + +FILES_${PN}-k2 = "/boot/chumby-firmware/k2.bin" +FILES_${PN}-rfs2 = "/boot/chumby-firmware/rfs2.bin" +FILES_${PN}-bl = "/boot/chumby-firmware/bl.bin" +FILES_${PN}-psp = "/boot/chumby-firmware/psp.bin" +FILES_${PN}-k1 = "/boot/chumby-firmware/k1.bin" +FILES_${PN}-rfs1 = "/boot/chumby-firmware/rfs1.bin" + diff --git a/packages/db/db_4.3.29.bb b/packages/db/db_4.3.29.bb index 750822fafe..026b45bd67 100644 --- a/packages/db/db_4.3.29.bb +++ b/packages/db/db_4.3.29.bb @@ -14,7 +14,7 @@ HOMEPAGE = "http://www.sleepycat.com" LICENSE = "BSD Sleepycat" VIRTUAL_NAME ?= "virtual/db" CONFLICTS = "db3" -PR = "r8" +PR = "r9" SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz" #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5" @@ -44,7 +44,7 @@ B = "${WORKDIR}/db-${PV}/build_unix" PACKAGES += " ${PN}-bin" # Package contents -FILES_${PN} = "${libdir}/libdb-4*so*" +FILES_${PN} = "${libdir}/libdb-4.*.so*" FILES_${PN}-bin = "${bindir}/*" # The dev package has the .so link (as in db3) and the .a's - # it is therefore incompatible (cannot be installed at the diff --git a/packages/e17/e-wm_0.16.999.041.bb b/packages/e17/e-wm_0.16.999.041.bb deleted file mode 100644 index 51e9e0d189..0000000000 --- a/packages/e17/e-wm_0.16.999.041.bb +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "E17 - the Enlightenment Window Mananger" -DEPENDS = "eet evas ecore edje efreet" -LICENSE = "MIT BSD" -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -inherit e update-alternatives - -SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/enlightenment-${PV}.tar.gz \ - file://fix-configure.patch;patch=1 \ - file://set-autoscroll-defaults.patch;patch=1 \ - file://Xsession.d/98enlightenment \ - file://applications.menu \ - " - -S = "${WORKDIR}/enlightenment-${PV}" - -PROFILE = "LOWRES_PDA" -PROFILE_c7x0 = "HIRES_PDA" -PROFILE_tosa = "HIRES_PDA" -PROFILE_spitz = "HIRES_PDA" -PROFILE_akita = "HIRES_PDA" - -EXTRA_OECONF = "--with-profile=${PROFILE} \ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -FILES_${PN} = "${bindir}/* ${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*.so ${libdir}/enlightenment/preload/*.so ${datadir} ${sysconfdir} ${libdir}/enlightenment/modules/cpufreq/*/freqset" -FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.a ${libdir}/enlightenment/modules/*/*/*.la ${libdir}/enlightenment/preload/*.a ${libdir}/enlightenment/preload/*.la" -FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/ ${libdir}/enlightenment/preload/.debug/" - -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' - find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -} - -do_install_append() { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d - - install -d ${D}/${sysconfdir}/xdg/menus - install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/ -} - -ALTERNATIVE_PATH = "${bindir}/enlightenment_start" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "16" diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb index 04e2ec7d59..e7af400a1c 100644 --- a/packages/e17/e-wm_cvs.bb +++ b/packages/e17/e-wm_cvs.bb @@ -1,7 +1,7 @@ -DESCRIPTION = "E17 - the Enlightenment Window Mananger" +DESCRIPTION = "The Enlightenment Window Mananger Version 17" DEPENDS = "eet evas ecore edje efreet" LICENSE = "MIT BSD" -PV = "0.16.999.041+cvs${SRCDATE}" +PV = "0.16.999.042+cvs${SRCDATE}" PR = "r0" inherit e update-alternatives diff --git a/packages/e17/rage_0.2.0.005.bb b/packages/e17/rage_cvs.bb index d2d6c3feae..3b7bed7a11 100644 --- a/packages/e17/rage_0.2.0.005.bb +++ b/packages/e17/rage_cvs.bb @@ -4,7 +4,10 @@ HOMEPAGE = "http://www.rasterman.com" LICENSE = "MIT BSD" DEPENDS = "evas ecore edje" SECTION = "x11/multimedia" - -SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/rage-${PV}.tar.gz" +PV = "0.3.0.042+cvs${SRCDATE}" inherit autotools + +SRC_URI = "${E_CVS};module=misc/rage" +S = "${WORKDIR}/rage" + diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index eacde2d012..6175c605c0 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -1,11 +1,9 @@ -DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \ -foundation libraries. It makes makes doing selections, drag and drop, event loops, \ -timeouts and idle handlers fast, optimized, and convenient." -LICENSE = "MIT" +DESCRIPTION = "Ecore is the Enlightenment application framework library" +LICENSE = "MIT BSD" DEPENDS = "curl eet evas tslib" # optional # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" -PV = "0.9.9.041+cvs${SRCDATE}" +PV = "0.9.9.042+cvs${SRCDATE}" inherit efl_library diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb index cea3d7602d..b0a2a24f98 100644 --- a/packages/efl1/ecore_cvs.bb +++ b/packages/efl1/ecore_cvs.bb @@ -1,5 +1,5 @@ require ecore.inc -PR = "r2" +PR = "r0" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ @@ -15,6 +15,7 @@ EXTRA_OECONF = "\ --disable-ecore-sdl \ --enable-ecore-fb \ --enable-ecore-evas \ + --enable-ecore-evas-x11-16 \ --disable-ecore-evas-x11-gl \ --enable-ecore-evas-xrender \ --disable-ecore-evas-dfb \ diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb index b7c85e8663..97dafb3931 100644 --- a/packages/efl1/edb_cvs.bb +++ b/packages/efl1/edb_cvs.bb @@ -1,5 +1,6 @@ -DESCRIPTION = "Edb is a database library" -LICENSE = "MIT" -PV = "0.0.0+cvs${SRCDATE}" +DESCRIPTION = "Edb is the Enlightenment database library" +LICENSE = "MIT BSD" +DEPENDS = "zlib" +PV = "1.0.5.042+cvs${SRCDATE}" inherit efl_library diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb index 734dccf56e..e930fc4795 100644 --- a/packages/efl1/edje_cvs.bb +++ b/packages/efl1/edje_cvs.bb @@ -1,9 +1,8 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -# can also install vim data files +DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" DEPENDS = "eet evas ecore embryo edje-native" LICENSE = "MIT BSD" -PV = "0.5.0.41+cvs${SRCDATE}" -PR = "r2" +PV = "0.5.0.042+cvs${SRCDATE}" +PR = "r0" inherit efl_library diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb index f2ab6a7408..370b385bf8 100644 --- a/packages/efl1/eet_cvs.bb +++ b/packages/efl1/eet_cvs.bb @@ -1,10 +1,7 @@ -DESCRIPTION = "EET is a tiny library designed to write an \ -arbitary set of chunks of data to a file and optionally compress \ -each chunk (very much like a zip file) and allow fast \ -random-access reading of the file later on." +DESCRIPTION = "EET is the Enlightenment data storage library" DEPENDS = "zlib jpeg" LICENSE = "MIT BSD" -PV = "0.9.10.041+cvs${SRCDATE}" -PR = "r1" +PV = "0.9.10.042+cvs${SRCDATE}" +PR = "r0" inherit efl_library diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb index 248dadd9bf..a1a027fc8f 100644 --- a/packages/efl1/efreet_cvs.bb +++ b/packages/efl1/efreet_cvs.bb @@ -1,8 +1,7 @@ -DESCRIPTION = "An implementation of freedesktop.org specs for the \ -Enlightenment Foundation Libraries" +DESCRIPTION = "The Enlightenment freedesktop.org library" DEPENDS = "ecore" LICENSE = "MIT BSD" -PV = "0.0.3.003+cvs${SRCDATE}" +PV = "0.0.3.042+cvs${SRCDATE}" PR = "r0" inherit efl_library diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb index 15546e206f..2f5ab176ce 100644 --- a/packages/efl1/embryo_cvs.bb +++ b/packages/efl1/embryo_cvs.bb @@ -1,10 +1,6 @@ -DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ -of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ -CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ -Embryo allows scripting capabilities in places that otherwise wouldn't support \ -basic programming structures such as in Edje EDCs." +DESCRIPTION = "The Enlightenment C-like scripting language for Edje" LICENSE = "MIT BSD" -PV = "0.9.1.041+cvs${SRCDATE}" -PR = "r1" +PV = "0.9.1.042+cvs${SRCDATE}" +PR = "r0" inherit efl_library diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb index 84302e4793..36a5065e7a 100644 --- a/packages/efl1/emotion_cvs.bb +++ b/packages/efl1/emotion_cvs.bb @@ -1,9 +1,9 @@ -DESCRIPTION = "Emotion is a multimedia library with backends: gstreamer and libxine" -LICENSE = "MIT" +DESCRIPTION = "The Enlightenment multimedia library" +LICENSE = "MIT BSD" # we no longer build the libxine backend, since the gstreamer backend seems more promising DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base" RRECOMMENDS_${PN} = "emotion-backend-gstreamer" -PV = "0.0.1+cvs${SRCDATE}" +PV = "0.1.0+cvs${SRCDATE}" PR = "r0" inherit efl_library diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb index 27c475c37d..fa4f4282e1 100644 --- a/packages/efl1/epdf_cvs.bb +++ b/packages/efl1/epdf_cvs.bb @@ -1,13 +1,11 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler" -LICENSE = "BSD" -DEPENDS = "poppler evas ecore etk" +LICENSE = "MIT BSD" +DEPENDS = "poppler evas ecore etk ewl" PV = "0.1.0+cvs${SRCDATE}" -PR = "r2" +PR = "r0" inherit efl_library -EXTRA_OECONF = "--disable-ewl" - SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \ file://fix-plugin-path-check.patch;HACK=1;patch=1" diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb index be2934dec8..8c71ef3e3d 100644 --- a/packages/efl1/epsilon_cvs.bb +++ b/packages/efl1/epsilon_cvs.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \ that is compliant with the freedesktop.org Thumbnail Managing Standard." -LICENSE = "BSD" +LICENSE = "MIT BSD" # can also depend on xine for movie thumbnails DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native" -PV = "0.3.0+cvs${SRCDATE}" +PV = "0.3.0.012+cvs${SRCDATE}" inherit efl_library diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_cvs.bb index 17e1f42b95..fa35d60d30 100644 --- a/packages/efl1/esmart_cvs.bb +++ b/packages/efl1/esmart_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" -LICENSE = "MIT" +LICENSE = "MIT BSD" DEPENDS = "evas ecore edje imlib2 epsilon libtool" -PV = "0.9.0+cvs${SRCDATE}" +PV = "0.9.0.042+cvs${SRCDATE}" inherit efl_library diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb index 238d640a68..90df74e61c 100644 --- a/packages/efl1/etk_cvs.bb +++ b/packages/efl1/etk_cvs.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries." DEPENDS = "evas ecore edje" LICENSE = "MIT" -PV = "0.1.0+cvs${SRCDATE}" -PR = "r1" +PV = "0.1.0.042+cvs${SRCDATE}" +PR = "r0" inherit efl_library diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index e05397067b..77ec2db308 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -1,18 +1,12 @@ -DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \ -anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \ -down to using normal X11 primitives such as pixmaps, lines and rectangles if \ -your CPU or graphics hardware are too slow." +DESCRIPTION = "Evas is the Enlightenment canvas API" LICENSE = "MIT BSD" # can also depend on valgrind, libsdl-x11, directfb DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender" -PV = "0.9.9.041+cvs${SRCDATE}" +PV = "0.9.9.042+cvs${SRCDATE}" inherit efl_library -# SRC_URI += "file://fix-configure.patch;patch=1" - FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" - EXTRA_OECONF = "<override me>" python populate_packages_prepend () { diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb index d30a03d7c1..862cc51370 100644 --- a/packages/efl1/evas_cvs.bb +++ b/packages/efl1/evas_cvs.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r2" +PR = "r0" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb index 193efcbe18..15a777df67 100644 --- a/packages/efl1/ewl_cvs.bb +++ b/packages/efl1/ewl_cvs.bb @@ -1,10 +1,8 @@ -DESCRIPTION = "The Enlightened Widget Library, \ -a simple-to-use general purpose widget library \ -based on the enlightenment foundation libraries." +DESCRIPTION = "The Enlightened Widget Library" DEPENDS = "evas ecore edje emotion efreet epsilon" -LICENSE = "MIT" -PV = "0.5.1+cvs${SRCDATE}" -PR = "r2" +LICENSE = "MIT BSD" +PV = "0.5.2.042+cvs${SRCDATE}" +PR = "r0" inherit efl_library diff --git a/packages/efl1/imlib2_1.4.0.002.bb b/packages/efl1/imlib2_1.4.1.000.bb index baee4b62b0..b0db13b5ce 100644 --- a/packages/efl1/imlib2_1.4.0.002.bb +++ b/packages/efl1/imlib2_1.4.1.000.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipu LICENSE = "BSD" # can also depend on tiff34, ungif or gif, z, bz2, id3tag DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" -PR = "r2" +PR = "r0" inherit efl_library diff --git a/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch b/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch new file mode 100644 index 0000000000..bab3747b1a --- /dev/null +++ b/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch @@ -0,0 +1,44 @@ +--- glibc-2.5.orig/debian/patches/any/local-dynamic-resolvconf.diff ++++ glibc-2.5/debian/patches/any/local-dynamic-resolvconf.diff +@@ -0,0 +1,41 @@ ++# All lines beginning with `# DP:' are a description of the patch. ++# DP: Description: allow dynamic long-running processes to ++# DP: re-read a dynamically updated resolv.conf on the fly ++# DP: Dpatch author: Adam Conrad <adconrad@ubuntu.com> ++# DP: Patch author: Thorsten Kukuk <kukuk@suse.de> ++# DP: Upstream status: Ubuntu-Specific ++# DP: Date: 2006-01-13 08:14:21 UTC ++ ++Index: resolv/res_libc.c ++=================================================================== ++--- resolv/res_libc.c.orig +++++ resolv/res_libc.c ++@@ -22,7 +22,7 @@ ++ #include <arpa/nameser.h> ++ #include <resolv.h> ++ #include <bits/libc-lock.h> ++- +++#include <sys/stat.h> ++ ++ /* The following bit is copied from res_data.c (where it is #ifdef'ed ++ out) since res_init() should go into libc.so but the rest of that ++@@ -94,8 +94,17 @@ ++ int ++ __res_maybe_init (res_state resp, int preinit) ++ { ++- if (resp->options & RES_INIT) { ++- if (__res_initstamp != resp->_u._ext.initstamp) { +++ static time_t last_mtime; +++ struct stat statbuf; +++ int ret; +++ +++ +++ if (resp->options & RES_INIT) { +++ ret = stat (_PATH_RESCONF, &statbuf); +++ if (__res_initstamp != resp->_u._ext.initstamp +++ || (ret == 0) && (last_mtime != statbuf.st_mtime)) +++ { +++ last_mtime = statbuf.st_mtime; ++ if (resp->nscount > 0) { ++ __res_iclose (resp, true); ++ return __res_vinit (resp, 1); diff --git a/packages/glibc/files/glibc-2.5-soft-fp-separate-strong-alias.patch b/packages/glibc/files/glibc-2.5-soft-fp-separate-strong-alias.patch index e41c1b7d96..e41c1b7d96 100755..100644 --- a/packages/glibc/files/glibc-2.5-soft-fp-separate-strong-alias.patch +++ b/packages/glibc/files/glibc-2.5-soft-fp-separate-strong-alias.patch diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index e30d357121..f50c85b1d0 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,17 +1,15 @@ require glibc.inc +PR = "r9" ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" -PR = "r8" - # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" - FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" GLIBC_ADDONS ?= "ports,nptl,libidn" @@ -36,57 +34,52 @@ python __anonymous () { RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -# file://noinfo.patch;patch=1 -# file://ldconfig.patch;patch=1;pnum=0 -# file://arm-machine-gmon.patch;patch=1;pnum=0 \ -# \ -# file://arm-ioperm.patch;patch=1;pnum=0 \ -# file://ldd.patch;patch=1;pnum=0 \ -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ - file://arm-memcpy.patch;patch=1 \ - file://arm-longlong.patch;patch=1 \ - file://fhs-linux-paths.patch;patch=1 \ - file://dl-cache-libcmp.patch;patch=1 \ - file://ldsocache-varrun.patch;patch=1 \ - file://nptl-crosscompile.patch;patch=1 \ - file://glibc-check_pf.patch;patch=1;pnum=0 \ -# file://glibc-2.4-compile.patch;patch=1 \ -# file://glibc-2.4-openat-3.patch;patch=1 \ -# file://fixup-aeabi-syscalls.patch;patch=1 \ - file://zecke-sane-readelf.patch;patch=1 \ - file://ldd-unbash.patch;patch=1 \ - file://generic-bits_select.h \ - file://generic-bits_types.h \ - file://generic-bits_typesizes.h \ - file://generic-bits_time.h \ - file://etc/ld.so.conf \ - file://generate-supported.mk" - +SRC_URI = "\ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ + file://arm-memcpy.patch;patch=1 \ + file://arm-longlong.patch;patch=1 \ + file://fhs-linux-paths.patch;patch=1 \ + file://dl-cache-libcmp.patch;patch=1 \ + file://ldsocache-varrun.patch;patch=1 \ + file://nptl-crosscompile.patch;patch=1 \ + file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1 \ + file://glibc-check_pf.patch;patch=1;pnum=0 \ + file://zecke-sane-readelf.patch;patch=1 \ + file://ldd-unbash.patch;patch=1 \ + file://generic-bits_select.h \ + file://generic-bits_types.h \ + file://generic-bits_typesizes.h \ + file://generic-bits_time.h \ + file://etc/ld.so.conf \ + file://generate-supported.mk \ +" # Build fails on sh3 and sh4 without additional patches SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" -#powerpc patches to add support for soft-float -SRC_URI_append_powerpc= " file://ppc-sfp-machine.patch;patch=1 \ - file://ppc-soft-fp-20070115.patch;patch=1 \ - file://ppc-ld-nofpu-20070104.patch;patch=1 \ - file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \ - file://powerpc-sqrt-hack.diff;patch=1 \ - file://glibc-2.5-soft-fp-separate-strong-alias.patch;patch=1" +# Powerpc patches to add support for soft-float +SRC_URI_append_powerpc = " file://ppc-sfp-machine.patch;patch=1 \ + file://ppc-soft-fp-20070115.patch;patch=1 \ + file://ppc-ld-nofpu-20070104.patch;patch=1 \ + file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \ + file://powerpc-sqrt-hack.diff;patch=1 \ + file://glibc-2.5-soft-fp-separate-strong-alias.patch;patch=1" S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ - --without-cvs --disable-profile --disable-debug --without-gd \ - --enable-clocale=gnu \ - --enable-add-ons=${GLIBC_ADDONS} \ - --with-headers=${STAGING_INCDIR} \ - --without-selinux \ - ${GLIBC_EXTRA_OECONF}" +EXTRA_OECONF = "\ + --enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS} \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF} \ +" EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index 46b56a0a65..d2816f83b1 100644 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@ -1,12 +1,11 @@ require glibc.inc +PR = "r2" ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" -PR = "r1" - # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" @@ -36,53 +35,47 @@ python __anonymous () { RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -# file://noinfo.patch;patch=1 -# file://ldconfig.patch;patch=1;pnum=0 -# file://arm-machine-gmon.patch;patch=1;pnum=0 \ -# \ -# file://arm-ioperm.patch;patch=1;pnum=0 \ -# file://ldd.patch;patch=1;pnum=0 \ -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ - file://arm-memcpy.patch;patch=1 \ - file://arm-longlong.patch;patch=1 \ - file://fhs-linux-paths.patch;patch=1 \ - file://dl-cache-libcmp.patch;patch=1 \ - file://ldsocache-varrun.patch;patch=1 \ - file://nptl-crosscompile.patch;patch=1 \ - file://glibc-check_pf.patch;patch=1;pnum=0 \ -# file://glibc-2.4-compile.patch;patch=1 \ -# file://glibc-2.4-openat-3.patch;patch=1 \ -# file://fixup-aeabi-syscalls.patch;patch=1 \ - file://zecke-sane-readelf.patch;patch=1 \ - file://ldd-unbash.patch;patch=1 \ - file://generic-bits_select.h \ - file://generic-bits_types.h \ - file://generic-bits_typesizes.h \ - file://generic-bits_time.h \ - file://etc/ld.so.conf \ - file://generate-supported.mk" - +SRC_URI = "\ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ + file://arm-memcpy.patch;patch=1 \ + file://arm-longlong.patch;patch=1 \ + file://fhs-linux-paths.patch;patch=1 \ + file://dl-cache-libcmp.patch;patch=1 \ + file://ldsocache-varrun.patch;patch=1 \ + file://nptl-crosscompile.patch;patch=1 \ + file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1 \ + file://glibc-check_pf.patch;patch=1;pnum=0 \ + file://zecke-sane-readelf.patch;patch=1 \ + file://ldd-unbash.patch;patch=1 \ + file://generic-bits_select.h \ + file://generic-bits_types.h \ + file://generic-bits_typesizes.h \ + file://generic-bits_time.h \ + file://etc/ld.so.conf \ + file://generate-supported.mk \ +" # Build fails on sh3 and sh4 without additional patches SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" -#powerpc patches to add support for soft-float -SRC_URI_append_powerpc= " \ - file://powerpc-sqrt-hack.diff;patch=1"" +# PowerPC Patches to add support for soft-float +SRC_URI_append_powerpc = "file://powerpc-sqrt-hack.diff;patch=1" S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ - --without-cvs --disable-profile --disable-debug --without-gd \ - --enable-clocale=gnu \ - --enable-add-ons=${GLIBC_ADDONS} \ - --with-headers=${STAGING_INCDIR} \ - --without-selinux \ - ${GLIBC_EXTRA_OECONF}" +EXTRA_OECONF = "\ + --enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS} \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF} \ +" EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" |