diff options
52 files changed, 41 insertions, 1426 deletions
diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index f7daa9f46c..bbc9f187ec 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -18,20 +18,14 @@ def get_src_tree(d): bb.error("S not defined, unable to find source tree.") return - try: - s_tree_raw = s.split('/')[1] - except IndexError: - return - + s_tree_raw = s.split('/')[1] s_tree = bb.data.expand(s_tree_raw, d) src_tree_path = os.path.join(workdir, s_tree) try: os.listdir(src_tree_path) except OSError: - bb.error("Expected to find source tree in '%s' which doesn't exist." % src_tree_path, s) - return - + bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path) bb.debug("Assuming source tree is '%s'" % src_tree_path) return s_tree @@ -45,14 +39,11 @@ sourcepkg_do_create_orig_tgz(){ done src_tree=${@get_src_tree(d)} - if test x${src_tree} = x; then - oenote "Skipping empty source tree" - return - fi - + + echo $src_tree oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz" tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree - cp -av $src_tree $src_tree.orig + cp -pPR $src_tree $src_tree.orig } sourcepkg_do_archive_bb() { @@ -83,14 +74,7 @@ python sourcepkg_do_dumpdata() { bb.note("Dumping metadata into '%s'" % dumpfile) f = open(dumpfile, "w") # emit variables and shell functions - - # FIXME: if we emit all, bitbake will get error while - # evaluating AUTOREV since we have AUTOREV = - # "${@bb.fetch.get_srcrev(d)}" in bitbake.conf, but get_srcrev - # without a valid SRC_URI will cause problem. - - bb.data.emit_env(f, d, True) - + bb.data.emit_env(f, d, True) # emit the metadata which isnt valid shell for e in d.keys(): if bb.data.getVarFlag(e, 'python', d): @@ -105,11 +89,8 @@ sourcepkg_do_create_diff_gz(){ echo $i >> temp/exclude-from-file done + src_tree=${@get_src_tree(d)} - if test x${src_tree} = x; then - oenote "Skipping empty source tree" - return - fi for i in `find . -maxdepth 1 -type f`; do mkdir -p $src_tree/${DISTRO}/files @@ -121,10 +102,10 @@ sourcepkg_do_create_diff_gz(){ rm -rf $src_tree.orig } -#EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz -EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_create_diff_gz +EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz addtask create_orig_tgz after do_unpack before do_patch -addtask archive_bb after do_patch before do_configure -#addtask dumpdata after do_archive_bb before do_configure -addtask create_diff_gz after do_archive_bb before do_configure +addtask archive_bb after do_patch before do_dumpdata +addtask dumpdata after do_archive_bb before do_create_diff_gz +addtask create_diff_gz after do_dump_data before do_configure + diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc deleted file mode 100644 index f2d816cd9e..0000000000 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ /dev/null @@ -1,15 +0,0 @@ -PREFERRED_VERSION_asterisk = "1.4.17" -PREFERRED_VERSION_busybox = "1.9.1" -PREFERRED_VERSION_dbus = "1.2.1" -PREFERRED_VERSION_dbus-glib = "0.74" -PREFERRED_VERSION_glib-2.0 = "2.16.1" -PREFERRED_VERSION_gnash = "0.8.2" -PREFERRED_VERSION_gpsdrive = "2.10pre4" -PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_intltool = "0.35.5" -PREFERRED_VERSION_intltool-native = "0.35.5" -PREFERRED_VERSION_libtool = "1.5.24" -PREFERRED_VERSION_midori = "0.0.17" -PREFERRED_VERSION_pulseaudio = "0.9.9" -PREFERRED_VERSION_udev = "118" -PREFERRED_VERSION_vte = "0.16.9" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 9028630653..381a6127aa 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -152,7 +152,6 @@ SRCREV_pn-opkg-sdk ?= "4247" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574" SRCREV_pn-psplash ?= "249" -SRCREV_pn-pty-forward-native ?= "4214" SRCREV_pn-py-odeviced ?= "190" SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "88" @@ -163,10 +162,7 @@ SRCREV_pn-python-lightmediascanner = "68" SRCREV_pn-python-pyrtc = "152" SRCREV_pn-s3c24xx-gpio ?= "4130" SRCREV_pn-settings-daemon ?= "2006" -SRCREV_pn-serial-forward ?= "4214" SRCREV_pn-sjf2410-linux-native ?= "4268" -SRCREV_pn-settings-daemon ?= "1755" -SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" SRCREV_pn-u-boot-openmoko ?= "4297" diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch deleted file mode 100644 index 878cb1dba9..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl ---- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl 2008-01-04 19:01:35.000000000 +0100 -@@ -35,6 +35,7 @@ - modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk> - modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au> - modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl> -+modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support) - Version svn-$Version - "; - -@@ -176,6 +177,25 @@ - 15812 => 3 , - 7906 => 2, - 3953 => 1 -+ }, -+ openstreetmap_tah => { -+ 256*576000 => 1, -+ 128*576000 => 2, -+ 64*576000 => 3, -+ 32*576000 => 4, -+ 16*576000 => 5, -+ 8*576000 => 6, -+ 4*576000 => 7, -+ 2*576000 => 8, -+ 576000 => 9, -+ 288000 => 10, -+ 144000 => 11, -+ 72000 => 12, -+ 36000 => 13, -+ 18000 => 14, -+ 9000 => 15, -+ 4500 => 16, -+ 2250 => 17 - } - }; - -@@ -331,7 +351,6 @@ - exit(); - } - -- - # Verify that we have the options that we need - pod2usage(1) if (&error_check); - -@@ -417,6 +436,13 @@ - print "+-----------------------------------------------------------+\n"; - print "| Landsat Maps are Copyright, ..... |\n"; - print "| They are free for non commercial use. |\n"; -+}elsif ( $mapserver eq 'openstreetmap_tah' ){ -+ print "+-----------------------------------------------------------+\n"; -+ print "| OpenStreetmap Maps are Copyright by the OpenStreetmap |\n"; -+ print "| project. |\n"; -+ print "| They are free for use under the terms of the |\n"; -+ print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\" |\n"; -+ print "| license. See http://www.openstreetmap.org for details. |\n"; - } elsif ( ! $force) { - print "You are violating the map servers copyright!\n"; - print "Are you sure you want to continue? [y|n] "; -@@ -700,6 +726,11 @@ - { - ($url,$mapscale)=googlemap_url($lati,$long,$scale); - } -+ elsif ( $mapserver eq 'openstreetmap_tah') -+ { -+ $filename=~s/\.gif/.png/; -+ ($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale); -+ } - else - { - print "Unknown map sever :", $mapserver, "\n"; -@@ -935,6 +966,37 @@ - return ($url,$mapscale); - } - -+############################################################################# -+sub openstreetmap_tah_url($$$){ -+ my $lati = shift; -+ my $long = shift; -+ my $scale = shift; -+ -+ my $mapscale = $scale; -+ my $zoom = undef; -+ for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) { -+ next unless $s == $scale; -+ $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s}; -+ $mapscale = $s; -+ last; -+ } -+ -+ unless ( $zoom ) { -+ print "Error calculating Zoomlevel for Scale: $scale\n"; -+ return (undef,undef); -+ } -+ -+ if ($debug) { -+ print "\n"; -+ print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n"; -+ print "lat: $lati\n"; -+ print "lon: $long\n"; -+ } -+ -+ my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png"; -+# print "$url\n"; -+ return ($url,$mapscale); -+} - - ############################################################################# - sub eniro_url($$$){ -@@ -2284,7 +2346,7 @@ - =item B<--mapserver <MAPSERVER>> - - Mapserver to download from. Default: 'expedia'. --Currently can use: landsat or expedia. -+Currently usable: landsat, expedia or openstreetmap_tah. - - geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, - but they are !!!NOT!!!! in the right scale. -@@ -2294,6 +2356,9 @@ - - landsat covers the whole world with satelite Photos - -+openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see -+ http://www.openstreetmap.org and http://tah.openstreetmap.org. -+ - gov_au is for Australia - - incrementp for japanese Maps diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch deleted file mode 100644 index c51c80931c..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: src/map_handler.c -=================================================================== ---- aa/src/map_handler.c (Revision 1699) -+++ aa/src/map_handler.c (Revision 1700) -@@ -660,9 +660,12 @@ - if (maploaded) - gdk_pixbuf_unref (image); - -+#ifdef MAPNIK - if ( !strcmp (filename,"mapnik") ) { - limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL); -- } else { -+ } else -+#endif -+ { - limage = gdk_pixbuf_new_from_file (filename, NULL); - if (limage == NULL) - { diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch deleted file mode 100644 index c8c0fe9c6a..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am ---- gpsdrive-2.10pre4.orig/src/Makefile.am 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/src/Makefile.am 2007-12-28 18:50:29.000000000 +0100 -@@ -14,14 +14,14 @@ - -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \ - -DLIBDIR=\"${libdir}\" \ - -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \ -- ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\ -- -I/usr/include/ \ -- -I/usr/local/include \ -- -I/opt/boost_1_35/include/boost-1_35 \ -- -I/usr/local/include/freetype2 \ -- -I/usr/include/freetype2 \ -+ ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK} -+# -I/usr/include/ \ -+# -I/usr/local/include \ -+# -I/opt/boost_1_35/include/boost-1_35 \ -+# -I/usr/local/include/freetype2 \ -+# -I/usr/include/freetype2 \ - -I. \ -- -L/usr/local/lib -+# -L/usr/local/lib - - # -I/usr/include/dbus-1.0/ - -diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure ---- gpsdrive-2.10pre4.orig/configure 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/configure 2008-01-06 14:49:11.000000000 +0100 -@@ -35950,10 +35950,13 @@ - # Yep, its ebil, but I does not know better... - #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` - # default on debian should be: /usr/share/perl5/ --PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` -+#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` - #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` --PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` -+#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` - -+# hard code path for OpenEmbedded environment as I don't know a way -+# to detect it automatically -+PERL_PACKAGE_DIR="/usr/share/perl5" - - ac_perl_modules="File::Basename " - # Make sure we have perl -@@ -37840,11 +37843,11 @@ - # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') - #fi - --if test -f /usr/include/mysql/mysql.h; then -- CFLAGS="$CFLAGS -I/usr/include/mysql" --else -- CFLAGS="$CFLAGS -Imysql" --fi -+#if test -f /usr/include/mysql/mysql.h; then -+# CFLAGS="$CFLAGS -I/usr/include/mysql" -+#else -+# CFLAGS="$CFLAGS -Imysql" -+#fi - - CFLAGS="$CFLAGS $OPT_CFLAGS" - CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" -diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac ---- gpsdrive-2.10pre4.orig/configure.ac 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/configure.ac 2008-01-06 14:48:50.000000000 +0100 -@@ -662,9 +662,12 @@ - # Yep, its ebil, but I does not know better... - #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` - # default on debian should be: /usr/share/perl5/ --PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` -+#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` - #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` --PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` -+#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` -+# hard code path for OpenEmbedded environment as I don't know a way -+# to detect it automatically -+PERL_PACKAGE_DIR="/usr/share/perl5" - AC_SUBST(PERL_PACKAGE_DIR) - - AC_PROG_PERL_MODULES(File::Basename , , AC_MSG_ERROR(Need Perl module File::Basename)) -@@ -719,11 +722,11 @@ - # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') - #fi - --if test -f /usr/include/mysql/mysql.h; then -- CFLAGS="$CFLAGS -I/usr/include/mysql" --else -- CFLAGS="$CFLAGS -Imysql" --fi -+#if test -f /usr/include/mysql/mysql.h; then -+# CFLAGS="$CFLAGS -I/usr/include/mysql" -+#else -+# CFLAGS="$CFLAGS -Imysql" -+#fi - - CFLAGS="$CFLAGS $OPT_CFLAGS" - CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop deleted file mode 100644 index 96e8155861..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=GPSDrive -Comment=GPS map software -Exec=gpsdrive -M pda -1 -Icon=gpsicon -Terminal=false -Type=Application -Categories=Graphics;Network;Geography;Application;Other -StartupNotify=true diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb deleted file mode 100644 index 102a917c1f..0000000000 --- a/packages/gpsdrive/gpsdrive_2.10pre4.bb +++ /dev/null @@ -1,33 +0,0 @@ -require gpsdrive.inc - -DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql" -RDEPENDS_${PN} += "libwww-perl" - -PR = "r2" - -SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \ - file://gpsdrive_2.10pre4.desktop \ - file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \ - file://gpsdrive-ifdef-mapnik.patch;patch=1 \ - file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1" - -do_install_append () { - mkdir -p ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop - mkdir -p ${D}${datadir}/pixmaps - cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps - # remove stuff we don't want to package - rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one - rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux - rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo -} - -PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons" - -FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml" -FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi" -FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils" -FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small" -FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg" -FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt" -FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation" diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty b/packages/hostap/hostap-daemon-0.5.10/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty +++ b/packages/hostap/hostap-daemon-0.5.10/.mtn2git_empty diff --git a/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff b/packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff index 9534199e78..43b275c67b 100644 --- a/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff +++ b/packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff @@ -1,7 +1,13 @@ -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 @@ +diff -urN hostapd-0.5.10.orig/Makefile hostapd-0.5.10/Makefile +--- hostapd-0.5.10.orig/Makefile 2008-02-20 01:08:54.000000000 +0100 ++++ hostapd-0.5.10/Makefile 2008-04-28 17:01:36.000000000 +0200 +@@ -1,10 +1,14 @@ ++ifndef CC + CC=gcc ++endif + DIR_WPA_SUPPLICANT=. + + ifndef CFLAGS CFLAGS = -MMD -O2 -Wall -g endif @@ -10,7 +16,7 @@ diff -urN hostapd.orig/Makefile hostapd/Makefile # 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 @@ +@@ -333,10 +337,10 @@ fi install: all @@ -21,5 +27,5 @@ diff -urN hostapd.orig/Makefile hostapd/Makefile - $(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) + driver_conf.c: Makefile .config + rm -f driver_conf.c diff --git a/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty b/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty +++ /dev/null diff --git a/packages/hostap/hostap-daemon-0.6.3/init b/packages/hostap/hostap-daemon-0.6.3/init deleted file mode 100644 index 79f74b681e..0000000000 --- a/packages/hostap/hostap-daemon-0.6.3/init +++ /dev/null @@ -1,37 +0,0 @@ -#!/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 diff --git a/packages/hostap/hostap-daemon/init b/packages/hostap/hostap-daemon/init index ed4c9de1a9..79f74b681e 100644 --- a/packages/hostap/hostap-daemon/init +++ b/packages/hostap/hostap-daemon/init @@ -2,7 +2,7 @@ DAEMON=/usr/sbin/hostapd NAME=hostapd DESC="HOSTAP Daemon" -ARGS="/etc/hostapd.conf" +ARGS="/etc/hostapd.conf -B" test -f $DAEMON || exit 0 @@ -10,25 +10,23 @@ set -e case "$1" in start) - echo -n "starting $DESC: $NAME... " - start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS - echo "done." + echo -n "Starting $DESC: " + start-stop-daemon -S -x $DAEMON -- $ARGS + echo "$NAME." ;; stop) - echo -n "stopping $DESC: $NAME... " - start-stop-daemon -K -n $NAME - echo "done." + echo -n "Stopping $DESC: " + start-stop-daemon -K -x $DAEMON + echo "$NAME." ;; restart) - echo "restarting $DESC: $NAME... " - $0 stop + $0 stop $0 start - echo "done." ;; reload) - echo -n "reloading $DESC: $NAME... " - killall -HUP $(basename ${DAEMON}) - echo "done." + echo -n "Reloading $DESC: " + killall -HUP $(basename ${DAEMON}) + echo "$NAME." ;; *) echo "Usage: $0 {start|stop|restart|reload}" diff --git a/packages/hostap/hostap-daemon_0.5.1.bb b/packages/hostap/hostap-daemon_0.5.1.bb deleted file mode 100644 index de3abdbea5..0000000000 --- a/packages/hostap/hostap-daemon_0.5.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require hostap-daemon.inc - -PR = "r1" - -DEFAULT_PREFERENCE = "-1" diff --git a/packages/hostap/hostap-daemon_0.6.3.bb b/packages/hostap/hostap-daemon_0.5.10.bb index 37b710db19..f75efc4a34 100644 --- a/ |