[oe-commits] org.oe.dev merge of '40f293b10b110d85c793d96acc26403ea53edb48'
xora commit
openembedded-commits at lists.openembedded.org
Thu Nov 22 17:04:03 UTC 2007
merge of '40f293b10b110d85c793d96acc26403ea53edb48'
and '8e1c07ccc20b627b1a8808a0a3b8a7afcaf72b79'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: da208288712062005c17d9f4b6bea22ac67c9152
ViewMTN: http://monotone.openembedded.org/revision/info/da208288712062005c17d9f4b6bea22ac67c9152
Files:
1
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
packages/tasks/task-openmoko.bb
packages/hostap/hostap-daemon-0.6.0
packages/hostap/hostap-daemon-0.6.0/init
packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
packages/hostap/hostap-daemon_0.6.0.bb
Diffs:
#
# mt diff -r40f293b10b110d85c793d96acc26403ea53edb48 -rda208288712062005c17d9f4b6bea22ac67c9152
#
#
#
# patch "conf/distro/include/moko-autorev.inc"
# from [6418329b9ade84d12329d5175ac7819e41dc9e11]
# to [2d16ad483496ff951a3f0b328f54cd73337dfc61]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [b1e3777e41aa3fe56bbd5ae76a0a3062c64c1cdd]
# to [d405f584be665c3811a81f973e98574037e5001a]
#
# patch "packages/tasks/task-openmoko.bb"
# from [f0b4bb1fe9d73d5cd26853e1a02d2f654a4a71f3]
# to [0d1d4e92a7c8f07375d840f5e0315ecf48ec2b5b]
#
============================================================
--- conf/distro/include/moko-autorev.inc 6418329b9ade84d12329d5175ac7819e41dc9e11
+++ conf/distro/include/moko-autorev.inc 2d16ad483496ff951a3f0b328f54cd73337dfc61
@@ -35,6 +35,7 @@ SRCREV_pn-openmoko-messages ?= "${AUTORE
SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
+SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc b1e3777e41aa3fe56bbd5ae76a0a3062c64c1cdd
+++ conf/distro/include/sane-srcrevs.inc d405f584be665c3811a81f973e98574037e5001a
@@ -81,7 +81,7 @@ SRCREV_pn-openmoko-messages ?= "2276"
SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-mediaplayer2 ?= "3345"
SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-messages2 ?= "3424"
+SRCREV_pn-openmoko-messages2 ?= "3477"
SRCREV_pn-openmoko-panel-battery ?= "3360"
SRCREV_pn-openmoko-panel-bt ?= "3149"
SRCREV_pn-openmoko-panel-clock ?= "2567"
@@ -105,7 +105,7 @@ SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-theme-standard2 ?= "3425"
SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3342"
+SRCREV_pn-openmoko-today2 ?= "3478"
SRCREV_pn-openmoko-today2-folders ?= "3414"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "206"
============================================================
--- packages/tasks/task-openmoko.bb f0b4bb1fe9d73d5cd26853e1a02d2f654a4a71f3
+++ packages/tasks/task-openmoko.bb 0d1d4e92a7c8f07375d840f5e0315ecf48ec2b5b
@@ -1,8 +1,8 @@ PROVIDES = "task-openmoko-everything"
DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r69"
+PR = "r70"
inherit task
@@ -139,7 +139,7 @@ RDEPENDS_task-openmoko-pim = "\
openmoko-appmanager2 \
openmoko-tasks2 \
openmoko-mediaplayer2 \
-# openmoko-messages \
+ openmoko-messages2 \
"
#
#
# mt diff -r8e1c07ccc20b627b1a8808a0a3b8a7afcaf72b79 -rda208288712062005c17d9f4b6bea22ac67c9152
#
#
#
# add_dir "packages/hostap/hostap-daemon-0.6.0"
#
# add_file "packages/hostap/hostap-daemon-0.6.0/init"
# content [80bfdea40d350f7069665dbcaf302de3874d55b3]
#
# add_file "packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff"
# content [8ff0a526fa703041b901ba825fab2cca7fbe1ca8]
#
# add_file "packages/hostap/hostap-daemon_0.6.0.bb"
# content [5eb3e365f82dc33607030d0705fdf7c84d502cdd]
#
============================================================
--- packages/hostap/hostap-daemon-0.6.0/init 80bfdea40d350f7069665dbcaf302de3874d55b3
+++ packages/hostap/hostap-daemon-0.6.0/init 80bfdea40d350f7069665dbcaf302de3874d55b3
@@ -0,0 +1,37 @@
+#!/bin/sh
+DAEMON=/usr/sbin/hostapd
+NAME=hostapd
+DESC="HOSTAP Daemon"
+ARGS="/etc/hostapd.conf -B"
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+ start)
+ echo -n "Starting $DESC: "
+ start-stop-daemon -S -x $DAEMON -- $ARGS
+ echo "$NAME."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: "
+ start-stop-daemon -K -x $DAEMON
+ echo "$NAME."
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ reload)
+ echo -n "Reloading $DESC: "
+ killall -HUP $(basename ${DAEMON})
+ echo "$NAME."
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff 8ff0a526fa703041b901ba825fab2cca7fbe1ca8
+++ packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff 8ff0a526fa703041b901ba825fab2cca7fbe1ca8
@@ -0,0 +1,25 @@
+diff -urN hostapd.orig/Makefile hostapd/Makefile
+--- hostapd.orig/Makefile 2007-05-28 19:26:55.000000000 +0200
++++ hostapd/Makefile 2007-11-22 16:28:44.000000000 +0100
+@@ -6,6 +6,8 @@
+ CFLAGS = -MMD -O2 -Wall -g
+ endif
+
++TARGET_PREFIX ?= /usr/local/bin/
++
+ # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
+ # a file (undefine it, if you want to save in binary size)
+ CFLAGS += -DHOSTAPD_DUMP_STATE
+@@ -361,10 +363,10 @@
+ fi
+
+ install: all
+- for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
++ for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done
+
+ hostapd: $(OBJS)
+- $(CC) -o hostapd $(OBJS) $(LIBS)
++ $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+
+ OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
+ hostapd_cli: $(OBJS_c)
============================================================
--- packages/hostap/hostap-daemon_0.6.0.bb 5eb3e365f82dc33607030d0705fdf7c84d502cdd
+++ packages/hostap/hostap-daemon_0.6.0.bb 5eb3e365f82dc33607030d0705fdf7c84d502cdd
@@ -0,0 +1,40 @@
+DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
+ file://makefile-cross.diff;patch=1 \
+ file://defconfig \
+ file://init"
+
+S = "${WORKDIR}/hostapd-${PV}/hostapd"
+
+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+
+inherit update-rc.d
+INITSCRIPT_NAME=hostapd
+
+do_configure() {
+ install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+ if [ "x$HAS_PCI" == "x1" ] ; then
+ echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+ echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+ fi
+}
+
+do_compile() {
+ CFLAGS='${CFLAGS}' CC='${CC}' make
+}
+
+do_install() {
+ install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
+ make TARGET_PREFIX=${D}${sbindir} install
+ install -m 0644 hostapd.conf ${D}${sysconfdir}
+ install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
+}
+
More information about the Openembedded-commits
mailing list