Merge commit 'e1298b0b9ddba34f4ac1a54735942d42a54eb3ef' into dora
This commit is contained in:
commit
c05702b766
|
@ -1,4 +1,4 @@
|
|||
IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} task-osmocom task-sysmocom"
|
||||
IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} packagegroup-osmocom task-sysmocom"
|
||||
IMAGE_LINGUAS = " "
|
||||
LICENSE = "MIT"
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
DEPENDS = "${MACHINE_EXTRA_RDEPENDS}"
|
||||
IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} task-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
|
||||
IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} packagegroup-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
|
||||
IMAGE_LINGUAS = " "
|
||||
IMAGE_FEATURES += " package-management "
|
||||
LICENSE = "MIT"
|
||||
|
|
|
@ -14,13 +14,15 @@ BTS_FIRMWARE_NAME_sysmobts-2050 = "sysmobts-v2"
|
|||
SRCREV = "bcc4fa827be7f59486ff305d664b42a142025f9b"
|
||||
|
||||
# odu handling.
|
||||
BRANCH="v3.2"
|
||||
SRCREV_sysmocom-odu = "aadf22be50ac2abb2a9437b9ad3bba4ccdca540b"
|
||||
BRANCH_sysmocom-odu = "sob-odu/linux-3.2.63"
|
||||
LINUX_VERSION_sysmocom-odu = "3.2.63"
|
||||
|
||||
PR = "r37"
|
||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \
|
||||
SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=${BRANCH} \
|
||||
file://mISDN_loop.patch;patch=1 \
|
||||
file://defconfig"
|
||||
S = "${WORKDIR}/git"
|
||||
|
|
|
@ -6,7 +6,7 @@ DEPENDS = "ncurses python"
|
|||
#DEPENDS = "ncurses libusb1 python"
|
||||
PROVIDES = "virtual/gpsd"
|
||||
|
||||
PR = "r3.16"
|
||||
PR = "r3.17"
|
||||
|
||||
SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
|
||||
file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \
|
||||
|
@ -119,7 +119,8 @@ PACKAGES =+ "libgps libgpsd gpsd-udev gpsd-conf gpsd-gpsctl gps-utils"
|
|||
#FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug"
|
||||
|
||||
RDEPENDS_${PN} = "gpsd-gpsctl"
|
||||
RRECOMMENDS_${PN} = "gpsd-conf gpsd-udev gpsd-machine-conf"
|
||||
RRECOMMENDS_${PN} = "gpsd-conf gpsd-machine-conf"
|
||||
RSUGGESTS_${PN} = "gpsd-udev"
|
||||
|
||||
DESCRIPTION_gpsd-udev = "udev relevant files to use gpsd hotplugging"
|
||||
FILES_gpsd-udev = "${base_libdir}/udev ${sysconfdir}/udev/*"
|
||||
|
|
|
@ -10,11 +10,11 @@ Subject: [PATCH 1/1] Add wifi2udp program
|
|||
2 files changed, 149 insertions(+), 1 deletion(-)
|
||||
create mode 100644 wifi2udp.c
|
||||
|
||||
Index: wireless_tools.29/Makefile
|
||||
Index: wireless_tools.30/Makefile
|
||||
===================================================================
|
||||
--- wireless_tools.29.orig/Makefile 2014-09-08 17:27:45.000000000 +0200
|
||||
+++ wireless_tools.29/Makefile 2014-09-08 17:32:52.065211007 +0200
|
||||
@@ -48,7 +48,7 @@
|
||||
--- wireless_tools.30.orig/Makefile
|
||||
+++ wireless_tools.30/Makefile
|
||||
@@ -50,7 +50,7 @@ WEXT_HEADER = wireless.$(WE_VERSION).h
|
||||
# Targets to build
|
||||
STATIC=libiw.a
|
||||
DYNAMIC=libiw.so.$(WT_VERSION)
|
||||
|
@ -23,7 +23,16 @@ Index: wireless_tools.29/Makefile
|
|||
MANPAGES8=iwconfig.8 iwlist.8 iwpriv.8 iwspy.8 iwgetid.8 iwevent.8 ifrename.8
|
||||
MANPAGES7=wireless.7
|
||||
MANPAGES5=iftab.5
|
||||
@@ -135,6 +135,8 @@
|
||||
@@ -105,7 +105,7 @@ endif
|
||||
|
||||
# Other flags
|
||||
CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
|
||||
- -Wpointer-arith -Wcast-qual -Winline -I.
|
||||
+ -Wpointer-arith -Wcast-qual -Winline -I. -ggdb3
|
||||
#CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
|
||||
DEPFLAGS=-MMD
|
||||
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG)
|
||||
@@ -137,6 +137,8 @@ ifrename: ifrename.o $(IWLIB)
|
||||
|
||||
macaddr: macaddr.o $(IWLIB)
|
||||
|
||||
|
@ -32,11 +41,11 @@ Index: wireless_tools.29/Makefile
|
|||
iwmulticall: iwmulticall.o
|
||||
$(CC) $(LDFLAGS) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS)
|
||||
|
||||
Index: wireless_tools.29/wifi2udp.c
|
||||
Index: wireless_tools.30/wifi2udp.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ wireless_tools.29/wifi2udp.c 2014-09-08 17:30:08.217211001 +0200
|
||||
@@ -0,0 +1,146 @@
|
||||
--- /dev/null
|
||||
+++ wireless_tools.30/wifi2udp.c
|
||||
@@ -0,0 +1,149 @@
|
||||
+
|
||||
+#include <unistd.h>
|
||||
+#include <stdio.h>
|
||||
|
@ -122,6 +131,7 @@ Index: wireless_tools.29/wifi2udp.c
|
|||
+ char bssid[20];
|
||||
+ char line[1024];
|
||||
+ char essid_escaped[50];
|
||||
+ wireless_scan *old_result;
|
||||
+ iw_sawap_ntop(&result->ap_addr, bssid);
|
||||
+
|
||||
+ escape_essid(result->b.essid, essid_escaped, 50);
|
||||
|
@ -131,7 +141,9 @@ Index: wireless_tools.29/wifi2udp.c
|
|||
+ rc = sendto(sock, line, strlen(line), 0, (struct sockaddr*)&remote, sizeof(remote));
|
||||
+ if (rc == -1)
|
||||
+ printf("Failed to send message: %s\n", strerror(errno));
|
||||
+ old_result = result;
|
||||
+ result = result->next;
|
||||
+ free(old_result);
|
||||
+ }
|
||||
+ sleep(delay);
|
||||
+ }
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
|
||||
FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
|
||||
|
||||
PRINC="6"
|
||||
PRINC="7"
|
||||
|
||||
SRC_URI += "file://0001-Add-wifi2udp-program.patch \
|
||||
file://wifi2udp.service"
|
||||
|
|
Loading…
Reference in New Issue