From e38684d612f4d65476f4c34c7aae9e562dd36ae6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 9 Nov 2014 15:19:31 +0100 Subject: [PATCH 1/8] watchdog: Catch up with upstream changes --- yocto-dizzy/{watchdog_5.13.bbappend => watchdog_5.14.bbappend} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename yocto-dizzy/{watchdog_5.13.bbappend => watchdog_5.14.bbappend} (100%) diff --git a/yocto-dizzy/watchdog_5.13.bbappend b/yocto-dizzy/watchdog_5.14.bbappend similarity index 100% rename from yocto-dizzy/watchdog_5.13.bbappend rename to yocto-dizzy/watchdog_5.14.bbappend From cf35573837dfb1b87cf754f761dbe7735addf9ad Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 10 Nov 2014 08:50:11 +0100 Subject: [PATCH 2/8] linux-sysmocom: Remove the branch name as it breaks on dizzy IIRC the branch name is not used in edison and it breaks in dizzy as the commit is noth within the branch. --- recipes-bsp/linux/linux-sysmocom_3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb index b5eaf16f07..0b59743631 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -20,7 +20,7 @@ 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 \ file://mISDN_loop.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/git" From 98c407d28c412f631c66240d9310a6c5c57a8298 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 10 Nov 2014 09:58:03 +0100 Subject: [PATCH 3/8] linux-sysmocom: Another speculative compile/fetch fix for dizzy Not specifying a branch leads to "master" being fetched. This means we now need to specify the rightbranch. Do that depending on what we build. --- recipes-bsp/linux/linux-sysmocom_3.2.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb index 0b59743631..4dd41f07f3 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -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 \ +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" From 682ec7043f1c091394780b7ca6390de5ca6a57e3 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 11 Nov 2014 20:27:19 +0100 Subject: [PATCH 4/8] gpsd: RSUGGESTS the gpsd-udev * switching gpsd-udev to RSUGGESTS on udev, makes it possible to not install gpsd-udev by default * increase minor PR FIXES: SYS#756 --- recipes-extra/gpsd/gpsd_3.10.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-extra/gpsd/gpsd_3.10.bb b/recipes-extra/gpsd/gpsd_3.10.bb index 74c5e73ddf..3fc1a4f026 100644 --- a/recipes-extra/gpsd/gpsd_3.10.bb +++ b/recipes-extra/gpsd/gpsd_3.10.bb @@ -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/*" From e7e42a79ae094ceae2281c69544926316c500e11 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 14 Nov 2014 13:58:10 +0100 Subject: [PATCH 5/8] u-boot: Catch up with upstream version bump and rename Not build tested yet. --- yocto-dizzy/{u-boot_2013.07.bbappend => u-boot_2014.07.bbappend} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename yocto-dizzy/{u-boot_2013.07.bbappend => u-boot_2014.07.bbappend} (100%) diff --git a/yocto-dizzy/u-boot_2013.07.bbappend b/yocto-dizzy/u-boot_2014.07.bbappend similarity index 100% rename from yocto-dizzy/u-boot_2013.07.bbappend rename to yocto-dizzy/u-boot_2014.07.bbappend From ffdbc76ae83fdefd08167cfbeb80c3297105fbfe Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 14 Nov 2014 14:16:31 +0100 Subject: [PATCH 6/8] misc: Start using "packagegroup-osmocom" The notion of "task" has been deprecated for a long time because the word is used for different things. The new word is "packagegroup" which describes the usage of "task-*" in a more obvious way. Dora and master builds can fully use packagegroup-* for everything and for edison we would need to spend some time to add a provides for packagegroup-* to the task- group. I don't intend to work on the edison part right now. --- recipes-apps/images/sysmocom-core-image-minimal.bb | 2 +- recipes-apps/images/sysmocom-image.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-apps/images/sysmocom-core-image-minimal.bb b/recipes-apps/images/sysmocom-core-image-minimal.bb index 1561912284..a53b9a2fd1 100644 --- a/recipes-apps/images/sysmocom-core-image-minimal.bb +++ b/recipes-apps/images/sysmocom-core-image-minimal.bb @@ -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" diff --git a/recipes-apps/images/sysmocom-image.inc b/recipes-apps/images/sysmocom-image.inc index 3dc073fcc1..d7a685d799 100644 --- a/recipes-apps/images/sysmocom-image.inc +++ b/recipes-apps/images/sysmocom-image.inc @@ -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" From 43d3a03b72d138b0981d86cca0b95e5a0cfc37bb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 14 Nov 2014 14:39:33 +0100 Subject: [PATCH 7/8] packagegroup: Catch up and rename the bbappend as well --- ...pend => packagegroup-core-standalone-osmo-sdk-target.bbappend} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename yocto-shared/{task-core-standalone-osmo-sdk-target.bbappend => packagegroup-core-standalone-osmo-sdk-target.bbappend} (100%) diff --git a/yocto-shared/task-core-standalone-osmo-sdk-target.bbappend b/yocto-shared/packagegroup-core-standalone-osmo-sdk-target.bbappend similarity index 100% rename from yocto-shared/task-core-standalone-osmo-sdk-target.bbappend rename to yocto-shared/packagegroup-core-standalone-osmo-sdk-target.bbappend From e1298b0b9ddba34f4ac1a54735942d42a54eb3ef Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 18 Nov 2014 09:37:53 +0100 Subject: [PATCH 8/8] wireless-tools: Attempt to fix memory leak We would leak all the results for all the scans. At some point in time the kernel OOM would kick-in and kill the process. Enable building with -ggdb3 for debug symbols and remmeber the old list head so we can free it. ==32240== 756 bytes in 3 blocks are definitely lost in loss record 7 of 8 ==32240== at 0x40291CC: malloc (in /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so) ==32240== by 0x804BCF5: iw_process_scanning_token (iwlib.c:3059) ==32240== by 0x804BCF5: iw_process_scan (iwlib.c:3255) ==32240== by 0x804BEAF: iw_scan (iwlib.c:3310) ==32240== by 0x8048FD8: scan_wifi (wifi2udp.c:72) ==32240== by 0x8048DB2: main (wifi2udp.c:143) --- .../files/0001-Add-wifi2udp-program.patch | 30 +++++++++++++------ .../wireless-tools_sysmocom.inc | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/recipes-fixes/wireless-tools/files/0001-Add-wifi2udp-program.patch b/recipes-fixes/wireless-tools/files/0001-Add-wifi2udp-program.patch index 231960b63f..11af861c26 100644 --- a/recipes-fixes/wireless-tools/files/0001-Add-wifi2udp-program.patch +++ b/recipes-fixes/wireless-tools/files/0001-Add-wifi2udp-program.patch @@ -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 +#include @@ -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); + } diff --git a/recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc b/recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc index 7eea7f3dd0..5dc82bd347 100644 --- a/recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc +++ b/recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc @@ -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"