[oe-commits] org.oe.dev merge of '833cc8c93eb7837c6f2fc140dcde5d238ed342b3'
svolpe commit
openembedded-commits at lists.openembedded.org
Mon Sep 24 21:42:52 UTC 2007
merge of '833cc8c93eb7837c6f2fc140dcde5d238ed342b3'
and '8cab20c14fd2e521e04d0f06c4802f4d9cd4832f'
Author: svolpe at openembedded.org
Branch: org.openembedded.dev
Revision: 9b66131716d3b26195fe8531dce88f391ccc6e71
ViewMTN: http://monotone.openembedded.org/revision/info/9b66131716d3b26195fe8531dce88f391ccc6e71
Files:
1
packages/pango/pango-directfb_1.18.1.bb
packages/ixp4xx/ixp4xx-npe-native-2.4
packages/ixp4xx/ixp4xx-npe-native-2.4/IxNpeMicrocode.h
packages/ixp4xx/ixp4xx-npe-native_2.4.bb
packages/ixp4xx/ixp4xx-npe_2.4.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/gsm/files/fic-gta01/gsmd
packages/gsm/libgsmd_svn.bb
packages/slugimage/slugimage.bb
Diffs:
#
# mt diff -r833cc8c93eb7837c6f2fc140dcde5d238ed342b3 -r9b66131716d3b26195fe8531dce88f391ccc6e71
#
#
#
# add_file "packages/pango/pango-directfb_1.18.1.bb"
# content [566b508db63210078c5d661c31754180fc975c08]
#
============================================================
--- packages/pango/pango-directfb_1.18.1.bb 566b508db63210078c5d661c31754180fc975c08
+++ packages/pango/pango-directfb_1.18.1.bb 566b508db63210078c5d661c31754180fc975c08
@@ -0,0 +1,9 @@
+require pango.inc
+RCONFLICTS = "pango"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc cairo-directfb"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/pango-${PV}.tar.bz2 \
+ file://no-tests.patch;patch=1"
+
+S = "${WORKDIR}/pango-${PV}"
+RRECOMMENDS_${PN} = ""
+FILESPATH = "${FILE_DIRNAME}/pango-${PV}:${FILE_DIRNAME}/files"
#
# mt diff -r8cab20c14fd2e521e04d0f06c4802f4d9cd4832f -r9b66131716d3b26195fe8531dce88f391ccc6e71
#
#
#
# add_dir "packages/ixp4xx/ixp4xx-npe-native-2.4"
#
# add_file "packages/ixp4xx/ixp4xx-npe-native-2.4/IxNpeMicrocode.h"
# content [6849ef7c650db81b1c32b0e9f074e9218688ac18]
#
# add_file "packages/ixp4xx/ixp4xx-npe-native_2.4.bb"
# content [f8a9c44c05db343ed93ee187df7c3b6f8c577ccf]
#
# add_file "packages/ixp4xx/ixp4xx-npe_2.4.bb"
# content [15f4ccd287616a9c9d39968d53f7b3f633e6cb62]
#
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
# from [98cebeae3c0ce6e140197e208b78795709e718e0]
# to [8a4180a809668bff351bfa747b92c98be2d6fc68]
#
# patch "packages/gsm/files/fic-gta01/gsmd"
# from [4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22]
# to [2e8eb40ba7250a248968a35a8112d2316b312fa4]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [8fae0d7334ab46af3afa0e6fadd8b9b7e7441a06]
# to [467cf52fff09287893fef7a8fc4938715b6e969b]
#
# patch "packages/slugimage/slugimage.bb"
# from [b1c154cff22e1258519e3cf7330adb5f73f8d887]
# to [10ee77fc8a455c2b8ed02fc8fd231a3bf2c8c201]
#
============================================================
--- packages/ixp4xx/ixp4xx-npe-native-2.4/IxNpeMicrocode.h 6849ef7c650db81b1c32b0e9f074e9218688ac18
+++ packages/ixp4xx/ixp4xx-npe-native-2.4/IxNpeMicrocode.h 6849ef7c650db81b1c32b0e9f074e9218688ac18
@@ -0,0 +1,143 @@
+/*
+ * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file
+ *
+ * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt at innominate.com>
+ *
+ * This file is released under the GPLv2
+ *
+ *
+ * compile with
+ *
+ * gcc -Wall IxNpeMicrocode.c -o IxNpeMicrocode
+ *
+ * Executing the resulting binary on your build-host creates the
+ * "NPE-[ABC].xxxxxxxx" files containing the selected microcode
+ *
+ * fetch the IxNpeMicrocode.c from the Intel Access Library.
+ * It will include this header.
+ *
+ * select Images for every NPE from the following
+ * (used C++ comments for easy uncommenting ....)
+ */
+
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS_TSLOT_SWITCH
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_FIREWALL
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS_2_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_DMA
+// #define IX_NPEDL_NPEIMAGE_NPEA_ATM_MPHY_12_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_MPHY_1_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_SPHY_1_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0
+// #define IX_NPEDL_NPEIMAGE_NPEA_WEP
+
+
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_DMA
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
+#define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL
+
+
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEC_DMA
+// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_SPAN
+// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_FIREWALL
+#define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH
+// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_ETH_LEARN_FILTER_SPAN_FIREWALL
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
+#define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL
+
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <endian.h>
+#include <byteswap.h>
+#include <string.h>
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define to_le32(x) (x)
+#define to_be32(x) bswap_32(x)
+#else
+#define to_be32(x) (x)
+#define to_le32(x) bswap_32(x)
+#endif
+
+struct dl_image {
+ unsigned magic;
+ unsigned id;
+ unsigned size;
+ unsigned data[0];
+};
+
+const unsigned IxNpeMicrocode_array[];
+
+int main(int argc, char *argv[])
+{
+ struct dl_image *image = (struct dl_image *)IxNpeMicrocode_array;
+ int imgsiz, i, fd, cnt;
+ const unsigned *arrayptr = IxNpeMicrocode_array;
+ const char *names[] = { "IXP425", "IXP465", "unknown" };
+ int bigendian = 1;
+
+ if (argc > 1) {
+ if (!strcmp(argv[1], "-le"))
+ bigendian = 0;
+ else if (!strcmp(argv[1], "-be"))
+ bigendian = 1;
+ else {
+ printf("Usage: %s <-le|-be>\n", argv[0]);
+ return EXIT_FAILURE;
+ }
+ }
+
+ for (image = (struct dl_image *)arrayptr, cnt=0;
+ (image->id != 0xfeedf00d) && (image->magic == 0xfeedf00d);
+ image = (struct dl_image *)(arrayptr), cnt++)
+ {
+ unsigned char field[4];
+ imgsiz = image->size + 3;
+ *(unsigned*)field = to_be32(image->id);
+ char filename[40], slnk[10];
+
+ sprintf(filename, "NPE-%c.%08x", (field[0] & 0xf) + 'A',
+ image->id);
+ sprintf(slnk, "NPE-%c", (field[0] & 0xf) + 'A');
+ printf("Writing image: %s.NPE_%c Func: %2x Rev: %02x.%02x "
+ "Size: %5d to: '%s'\n",
+ names[field[0] >> 4], (field[0] & 0xf) + 'A',
+ field[1], field[2], field[3], imgsiz*4, filename);
+ fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
+ if (fd >= 0) {
+ for (i=0; i<imgsiz; i++) {
+ *(unsigned*)field = bigendian ?
+ to_be32(arrayptr[i]) :
+ to_le32(arrayptr[i]);
+ write(fd, field, sizeof(field));
+ }
+ close(fd);
+ unlink(slnk);
+ symlink(filename, slnk);
+ } else {
+ perror(filename);
+ }
+ arrayptr += imgsiz;
+ }
+ close(fd);
+ return 0;
+}
============================================================
--- packages/ixp4xx/ixp4xx-npe-native_2.4.bb f8a9c44c05db343ed93ee187df7c3b6f8c577ccf
+++ packages/ixp4xx/ixp4xx-npe-native_2.4.bb f8a9c44c05db343ed93ee187df7c3b6f8c577ccf
@@ -0,0 +1,19 @@
+DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
+LICENSE = "Intel Software License Agreement"
+PR = "r0"
+
+SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip"
+SRC_URI += "file://IxNpeMicrocode.h"
+inherit native
+S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
+
+do_compile() {
+ mv ${WORKDIR}/IxNpeMicrocode.h ${S}/
+ gcc -Wall IxNpeMicrocode.c -o IxNpeMicrocode
+}
+
+do_stage() {
+ mv ${S}/IxNpeMicrocode ${S}/IxNpeMicrocode-${PV}
+ install -d ${STAGING_BINDIR}/
+ install -m 0755 ${S}/IxNpeMicrocode-${PV} ${STAGING_BINDIR}/
+}
============================================================
--- packages/ixp4xx/ixp4xx-npe_2.4.bb 15f4ccd287616a9c9d39968d53f7b3f633e6cb62
+++ packages/ixp4xx/ixp4xx-npe_2.4.bb 15f4ccd287616a9c9d39968d53f7b3f633e6cb62
@@ -0,0 +1,37 @@
+DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
+LICENSE = "Intel Software Licence Agreement"
+PR = "r0"
+DEPENDS = "ixp4xx-npe-native"
+
+# You need to download the IPL_ixp400NpeLibrary-3_0.zip file (without crypto) from:
+# http://www.intel.com/design/network/products/npfamily/ixp400_current.htm
+# and put it in your downloads directory so bitbake will find it.
+# Make sure you *read* and accept the license - it is not a standard one.
+
+SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip"
+S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
+
+COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
+
+FILES_${PN} = "${base_libdir}/firmware/NPE-B ${base_libdir}/firmware/NPE-C"
+
+do_compile() {
+ ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be
+}
+
+do_install() {
+ install -d ${D}/${base_libdir}/firmware/
+ rm ${S}/NPE-B
+ mv ${S}/NPE-B.* ${S}/NPE-B
+ install ${S}/NPE-B ${D}/${base_libdir}/firmware/
+ rm ${S}/NPE-C
+ mv ${S}/NPE-C.* ${S}/NPE-C
+ install ${S}/NPE-C ${D}/${base_libdir}/firmware/
+}
+
+do_populate_staging() {
+ install -d ${STAGING_FIRMWARE_DIR}
+ install ${S}/NPE-B ${STAGING_FIRMWARE_DIR}/
+ install ${S}/NPE-C ${STAGING_FIRMWARE_DIR}/
+}
+
============================================================
--- packages/glibc/glibc_2.3.5+cvs20050627.bb 98cebeae3c0ce6e140197e208b78795709e718e0
+++ packages/glibc/glibc_2.3.5+cvs20050627.bb 8a4180a809668bff351bfa747b92c98be2d6fc68
@@ -1,8 +1,8 @@ SRCDATE = "20050627"
require glibc.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
SRCDATE = "20050627"
-PR = "r14"
+PR = "r15"
#Doesnt build for sh3
DEFAULT_PREFERENCE_sh3="-1"
@@ -55,6 +55,7 @@ SRC_URI_append_arm = " file://dyn-ldconf
# seems to fail on tls platforms
SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_armeb = " file://dyn-ldconfig-20041128.patch;patch=1"
# Build fails on sh3 and sh4 without additional patches
SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1 \
============================================================
--- packages/gsm/files/fic-gta01/gsmd 4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22
+++ packages/gsm/files/fic-gta01/gsmd 2e8eb40ba7250a248968a35a8112d2316b312fa4
@@ -1,4 +1,4 @@
-##!/bin/sh
+#!/bin/sh
#
# gsmd This shell script starts and stops gsmd.
#
@@ -15,6 +15,7 @@ case "$1" in
start)
stty -F "$GSM_DEV" -crtscts
[ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
+ stty -F "$GSM_DEV" -echo
[ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
[ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
[ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
@@ -29,23 +30,20 @@ case "$1" in
fi
;;
stop)
- [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
-
echo -n "Stopping GSM daemon: "
start-stop-daemon -K -x /usr/sbin/gsmd
stty -F "$GSM_DEV" -crtscts
+ [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
echo "gsmd."
;;
restart|force-reload)
$0 stop
$0 start
- exit
;;
*)
- echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}"
+ echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}"
exit 1
;;
esac
exit 0
-
============================================================
--- packages/gsm/libgsmd_svn.bb 8fae0d7334ab46af3afa0e6fadd8b9b7e7441a06
+++ packages/gsm/libgsmd_svn.bb 467cf52fff09287893fef7a8fc4938715b6e969b
@@ -1,10 +1,10 @@ PV = "0.1+svnr${SRCREV}"
DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
HOMEPAGE = "http://www.openmoko.org"
LICENSE = "GPL LGPL"
SECTION = "libs/gsm"
PROVIDES += "gsmd"
PV = "0.1+svnr${SRCREV}"
-PR = "r29"
+PR = "r30"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://024_sms-text-in-bracket.patch;patch=1;minrev=2957 \
============================================================
--- packages/slugimage/slugimage.bb b1c154cff22e1258519e3cf7330adb5f73f8d887
+++ packages/slugimage/slugimage.bb 10ee77fc8a455c2b8ed02fc8fd231a3bf2c8c201
@@ -1,13 +1,13 @@ flash images for the Linksys NSLU2 devic
# slugimage - normally built native, a perl script
SECTION = "console/utils"
LICENSE = "BSD"
DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
flash images for the Linksys NSLU2 device. It also has jffs2 support"
-PR = "r11"
+PR = "r12"
RDEPENDS = "perl"
-SLUGIMAGE_SVN_REV ?= "103"
+SLUGIMAGE_SVN_REV ?= "104"
SLUGIMAGE_SVN_REPO ?= "http://svn.nslu2-linux.org/svnroot/slugimage/trunk"
addtask svnfetch before do_configure after do_patch
More information about the Openembedded-commits
mailing list