[oe-commits] org.oe.dev merge of '7c68840f9e61bf1b24bfe84c80958a929056fec3'
oe commit
openembedded-commits at lists.openembedded.org
Mon Oct 15 11:47:28 UTC 2007
merge of '7c68840f9e61bf1b24bfe84c80958a929056fec3'
and '96b052b9c5046dbbfa151a054726f9e9b67d7e7e'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 6cea0e089de18ef78c84f8d8e47107c117a92a40
ViewMTN: http://monotone.openembedded.org/revision/info/6cea0e089de18ef78c84f8d8e47107c117a92a40
Files:
1
packages/usbpath
packages/usbpath/usbpath-native_svn.bb
packages/usbpath/usbpath_svn.bb
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
packages/dfu-util/dfu-util-native_svn.bb
packages/dfu-util/dfu-util_svn.bb
packages/linux-libc-headers/linux-libc-headers-2.6.23
packages/linux-libc-headers/linux-libc-headers-2.6.23/procinfo.h
packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
Diffs:
#
# mt diff -r7c68840f9e61bf1b24bfe84c80958a929056fec3 -r6cea0e089de18ef78c84f8d8e47107c117a92a40
#
#
#
# add_dir "packages/usbpath"
#
# add_file "packages/usbpath/usbpath-native_svn.bb"
# content [2c360ca2b6915f0e077e0fa5c4f668415e51dfcd]
#
# add_file "packages/usbpath/usbpath_svn.bb"
# content [61551de573a39c0d443493ef48d187adb037426c]
#
# patch "conf/distro/include/insane-srcrevs.inc"
# from [6e7da1aa2c6130db2db09ae85664c3d6180a620c]
# to [56b1cdd28ecceacfd01475b723bc119e0dec9086]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [976be890989c81017f4dcd62106b6a418e60b250]
# to [3869ea9313b7cdedb815f168ca91cb2c92787e52]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [e19cc489466ab1c83a6c5132c5524e2bb08ab088]
# to [5e0b7020a16147b948f3cf8ab77187bdf0b43cf4]
#
# patch "packages/dfu-util/dfu-util-native_svn.bb"
# from [51d347879d9df6cb68a8cfe7839dea77544ac715]
# to [36c7a32697727fceeefe1a12b0c3abb728831cd4]
#
# patch "packages/dfu-util/dfu-util_svn.bb"
# from [cf6a45fe99370f4938bed1dbc2ca7123380f8322]
# to [ecc120ec36e47364e4715f34bd86856b6f93370f]
#
============================================================
--- packages/usbpath/usbpath-native_svn.bb 2c360ca2b6915f0e077e0fa5c4f668415e51dfcd
+++ packages/usbpath/usbpath-native_svn.bb 2c360ca2b6915f0e077e0fa5c4f668415e51dfcd
@@ -0,0 +1,7 @@
+require usbpath_svn.bb
+inherit native
+
+do_stage () {
+ autotools_stage_all
+}
+
============================================================
--- packages/usbpath/usbpath_svn.bb 61551de573a39c0d443493ef48d187adb037426c
+++ packages/usbpath/usbpath_svn.bb 61551de573a39c0d443493ef48d187adb037426c
@@ -0,0 +1,17 @@
+DESCRIPTION = "Convert the physical locations of a USB device to/from its number"
+AUTHOR = "Werner Almesberger <werner at openmoko.org>"
+SECTION = "console/utils"
+LICENSE = "GPL"
+
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;proto=http"
+
+S = "${WORKDIR}/usbpath"
+
+inherit autotools
+
+do_stage () {
+ autotools_stage_all
+}
+
============================================================
--- conf/distro/include/insane-srcrevs.inc 6e7da1aa2c6130db2db09ae85664c3d6180a620c
+++ conf/distro/include/insane-srcrevs.inc 56b1cdd28ecceacfd01475b723bc119e0dec9086
@@ -79,5 +79,7 @@ SRCREV_pn-mplayer ?= "${AUTOREV}"
SRCREV_pn-webkit-gtk ?= "${AUTOREV}"
SRCREV_pn-xoo ?= "${AUTOREV}"
SRCREV_pn-mplayer ?= "${AUTOREV}"
+SRCREV_pn-usbpath ?= "${AUTOREV}"
+SRCREV_pn-usbpath-native ?= "${AUTOREV}"
SRCREV ?= "${AUTOREV}"
============================================================
--- conf/distro/include/moko-autorev.inc 976be890989c81017f4dcd62106b6a418e60b250
+++ conf/distro/include/moko-autorev.inc 3869ea9313b7cdedb815f168ca91cb2c92787e52
@@ -63,4 +63,6 @@ SRCREV_pn-dfu-util-native ?= "${AUTOREV}
SRCREV_pn-uboot-openmoko ?= "${AUTOREV}"
SRCREV_pn-dfu-util ?= "${AUTOREV}"
SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
+SRCREV_pn-usbpath ?= "${AUTOREV}"
+SRCREV_pn-usbpath-native ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc e19cc489466ab1c83a6c5132c5524e2bb08ab088
+++ conf/distro/include/sane-srcrevs.inc 5e0b7020a16147b948f3cf8ab77187bdf0b43cf4
@@ -101,4 +101,6 @@ SRCREV_pn-libw100 ?= "47"
SRCREV_pn-networkmanager ?= "2887"
SRCREV_pn-networkmanager-applet ?= "200"
SRCREV_pn-libw100 ?= "47"
+SRCREV_pn-usbpath ?= "3108"
+SRCREV_pn-usbpath-native ?= "3108"
============================================================
--- packages/dfu-util/dfu-util-native_svn.bb 51d347879d9df6cb68a8cfe7839dea77544ac715
+++ packages/dfu-util/dfu-util-native_svn.bb 36c7a32697727fceeefe1a12b0c3abb728831cd4
@@ -1,8 +1,8 @@ inherit native
require dfu-util_${PV}.bb
inherit native
-DEPENDS = "libusb-native"
+DEPENDS = "libusb-native usbpath-native"
do_stage() {
install -d ${STAGING_BINDIR_NATIVE}
============================================================
--- packages/dfu-util/dfu-util_svn.bb cf6a45fe99370f4938bed1dbc2ca7123380f8322
+++ packages/dfu-util/dfu-util_svn.bb ecc120ec36e47364e4715f34bd86856b6f93370f
@@ -5,7 +5,7 @@ PR = "r0"
PV = "0.1+svnr${SRCREV}"
PR = "r0"
-DEPENDS = "libusb"
+DEPENDS = "libusb usbpath"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=dfu-util;proto=http"
S = "${WORKDIR}/dfu-util"
#
# mt diff -r96b052b9c5046dbbfa151a054726f9e9b67d7e7e -r6cea0e089de18ef78c84f8d8e47107c117a92a40
#
#
#
# add_dir "packages/linux-libc-headers/linux-libc-headers-2.6.23"
#
# add_file "packages/linux-libc-headers/linux-libc-headers-2.6.23/procinfo.h"
# content [d25df5c46fa7bcbf7d5e7d097e80d032aee11716]
#
# add_file "packages/linux-libc-headers/linux-libc-headers_2.6.23.bb"
# content [1793c1f183598c2d981b16023c4a14245807fc77]
#
============================================================
--- packages/linux-libc-headers/linux-libc-headers-2.6.23/procinfo.h d25df5c46fa7bcbf7d5e7d097e80d032aee11716
+++ packages/linux-libc-headers/linux-libc-headers-2.6.23/procinfo.h d25df5c46fa7bcbf7d5e7d097e80d032aee11716
@@ -0,0 +1,24 @@
+/*
+ * linux/include/asm-arm/procinfo.h
+ *
+ * Copyright (C) 1996-1999 Russell King
+ *
+ * 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.
+ */
+#ifndef __ASM_PROCINFO_H
+#define __ASM_PROCINFO_H
+
+#define HWCAP_SWP 1
+#define HWCAP_HALF 2
+#define HWCAP_THUMB 4
+#define HWCAP_26BIT 8 /* Play it safe */
+#define HWCAP_FAST_MULT 16
+#define HWCAP_FPA 32
+#define HWCAP_VFP 64
+#define HWCAP_EDSP 128
+#define HWCAP_JAVA 256
+#define HWCAP_IWMMXT 512
+#define HWCAP_CRUNCH 1024
+#endif
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.23.bb 1793c1f183598c2d981b16023c4a14245807fc77
+++ packages/linux-libc-headers/linux-libc-headers_2.6.23.bb 1793c1f183598c2d981b16023c4a14245807fc77
@@ -0,0 +1,66 @@
+require linux-libc-headers.inc
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS += "unifdef-native"
+PR = "r0"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+ file://procinfo.h"
+
+S = "${WORKDIR}/linux-${PV}"
+
+set_arch() {
+ case ${TARGET_ARCH} in
+ alpha*) ARCH=alpha ;;
+ arm*) ARCH=arm ;;
+ cris*) ARCH=cris ;;
+ hppa*) ARCH=parisc ;;
+ i*86*) ARCH=i386 ;;
+ ia64*) ARCH=ia64 ;;
+ mips*) ARCH=mips ;;
+ m68k*) ARCH=m68k ;;
+ powerpc*) ARCH=powerpc ;;
+ s390*) ARCH=s390 ;;
+ sh*) ARCH=sh ;;
+ sparc64*) ARCH=sparc64 ;;
+ sparc*) ARCH=sparc ;;
+ x86_64*) ARCH=x86_64 ;;
+ avr32*) ARCH=avr32 ;;
+ bfin*) ARCH=blackfin ;;
+ esac
+}
+
+do_configure() {
+ set_arch
+ oe_runmake allnoconfig ARCH=$ARCH
+}
+
+do_compile () {
+}
+
+do_install() {
+ set_arch
+ oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+}
+
+do_install_append_arm() {
+ cp ${WORKDIR}/procinfo.h ${D}${includedir}/asm/
+}
+
+STAGE_TEMP="${WORKDIR}/temp-staging"
+
+do_stage () {
+ set_arch
+ echo $ARCH
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+ if [ "$ARCH" = "arm" ]; then
+ cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
+ fi
+ install -d ${STAGING_INCDIR}
+ rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic
+ cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/
+ cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/
+ cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/
+}
More information about the Openembedded-commits
mailing list