From 8595fee2b237416bbd550335483df53a23f93060 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 11 Jan 2015 21:32:37 +0100 Subject: [PATCH 1/4] osmo-bts: Fix the normal bts build The sysmobts-mgr is now linking to libgps. This means we need to DEPEND on gpsd to have this library available. The tracking build for both dora and master is broken due this. --- recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index c98eefd470..9a2eafedde 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -7,11 +7,11 @@ SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=zecke/sysmobts SRCREV_osmobts = "83a549a153a30b8bc7122e0ca2f99ea6fcb1ea44" SRCREV_openbsc = "142d12d829d4207e2fe7dee34b8d82dd89015615" PV = "0.4.3+git${SRCPV}" -PR = "r16.${META_TELEPHONY_OSMO_INC}" +PR = "r17.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git" SRCREV_FORMAT = "openbsc-rosmobts" -DEPENDS = "libosmocore libosmo-abis femtobts-api" +DEPENDS = "libosmocore libosmo-abis femtobts-api gpsd" RDEPENDS_${PN} += "coreutils sysmobts-firmware (>= 3.11)" RCONFLICTS_${PN} = "sysmobts-firmware (< 3.11)" From d6b62f1548b931e59b9094742ef35ef857156166 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 12 Jan 2015 23:04:44 +0100 Subject: [PATCH 2/4] Drop our dropbear extension * The upstream sysvinit file looks good * We are using systemd service files anyway * The 2014.63 version doesn't exist and there is no point in renaming the file. --- yocto-dizzy/dropbear_2014.63.bbappend | 1 - 1 file changed, 1 deletion(-) delete mode 100644 yocto-dizzy/dropbear_2014.63.bbappend diff --git a/yocto-dizzy/dropbear_2014.63.bbappend b/yocto-dizzy/dropbear_2014.63.bbappend deleted file mode 100644 index a3a97a3fa8..0000000000 --- a/yocto-dizzy/dropbear_2014.63.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-fixes/dropbear/${PN}_sysmocom.inc From dbe4d9513a9b6397cba8cfefb41740afcfa56e12 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 4 Feb 2015 08:34:56 +0100 Subject: [PATCH 3/4] linux-sysmocom: Change defconfig to allow to use backported module We want to use backported modules this means we need to make some thing a module for it to work. Take Daniel's .config file, run make savedefconfig and update our defconfig. Related: SYS#850 --- .../linux/files/sysmocom-odu/defconfig | 29 ++++++++----------- recipes-bsp/linux/linux-sysmocom_3.2.bb | 2 +- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/recipes-bsp/linux/files/sysmocom-odu/defconfig b/recipes-bsp/linux/files/sysmocom-odu/defconfig index 0382da64d9..f06028a3de 100644 --- a/recipes-bsp/linux/files/sysmocom-odu/defconfig +++ b/recipes-bsp/linux/files/sysmocom-odu/defconfig @@ -3,11 +3,12 @@ CONFIG_LOCALVERSION="-PD13.1.2" CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y +CONFIG_FHANDLE=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 -CONFIG_BLK_DEV_INITRD=y CONFIG_CGROUPS=y +CONFIG_BLK_DEV_INITRD=y # CONFIG_PERF_EVENTS is not set CONFIG_SLAB=y CONFIG_PROFILING=y @@ -162,8 +163,8 @@ CONFIG_CAN_RAW=y CONFIG_CAN_BCM=y CONFIG_CAN_D_CAN=y CONFIG_CAN_D_CAN_PLATFORM=y -CONFIG_CFG80211=y -CONFIG_MAC80211=y +CONFIG_CFG80211=m +CONFIG_MAC80211=m CONFIG_RFKILL=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y @@ -217,17 +218,9 @@ CONFIG_USB_USBNET=y # CONFIG_USB_BELKIN is not set # CONFIG_USB_ARMLINUX is not set # CONFIG_USB_NET_ZAURUS is not set -CONFIG_WLAN=y CONFIG_RT2X00=m CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800_LIB=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_WL12XX_MENU=y +CONFIG_WL12XX_MENU=m CONFIG_WL12XX=m CONFIG_WL12XX_SDIO=m CONFIG_INPUT_EVDEV=y @@ -327,12 +320,13 @@ CONFIG_USB_OTG=y CONFIG_USB_MUSB_HDRC=y CONFIG_USB_MUSB_TI81XX_GLUE=y CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_ACM=y CONFIG_USB_STORAGE=y CONFIG_USB_SERIAL=y CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MUSB_HDRC=y +CONFIG_USB_GADGET_MUSB_HDRC=m CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_FILE_STORAGE=m @@ -342,10 +336,10 @@ CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y CONFIG_SDIO_UART=y CONFIG_MMC_OMAP_HS=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y CONFIG_RTC_CLASS=y -# CONFIG_RTC_DRV_M41T80 is not set CONFIG_RTC_DRV_TPS65910=y -# CONFIG_RTC_DRV_OMAP is not set # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y @@ -382,8 +376,11 @@ CONFIG_DEBUG_LL=y CONFIG_EARLY_PRINTK=y CONFIG_DEBUG_JTAG_ENABLE=y CONFIG_SECURITY=y +CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set CONFIG_CRC_CCITT=y @@ -391,5 +388,3 @@ CONFIG_CRC_T10DIF=y CONFIG_CRC_ITU_T=y CONFIG_CRC7=y CONFIG_LIBCRC32C=y -CONFIG_USB_ACM=y -CONFIG_FHANDLE=y diff --git a/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb index 7883cc8b85..fd7ccbf991 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -19,7 +19,7 @@ SRCREV_sysmocom-odu = "20547dac08c962e43a64ef5d4f182b20b2edd172" BRANCH_sysmocom-odu = "sob-odu/linux-3.2.63" LINUX_VERSION_sysmocom-odu = "3.2.63" -PR = "r39" +PR = "r40" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=${BRANCH} \ From 0efdefba34c485168e4d94336912df17251ef6cc Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 5 Feb 2015 16:46:45 +0100 Subject: [PATCH 4/4] sysmocom-idu: Introduce another machine that optimizes for core2 Harald wants to benefit from i686, sse2 and other optimizations. Create a new machine (that extends the sysmocom-bsc) to build for core2. --- conf/machine/sysmocom-idu.conf | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 conf/machine/sysmocom-idu.conf diff --git a/conf/machine/sysmocom-idu.conf b/conf/machine/sysmocom-idu.conf new file mode 100644 index 0000000000..9b650cea65 --- /dev/null +++ b/conf/machine/sysmocom-idu.conf @@ -0,0 +1,39 @@ +#@TYPE: Machine +#@NAME: common_pc +#@DESCRIPTION: Machine configuration for running a common x86 + +require conf/machine/include/tune-core2.inc +require conf/machine/include/genericx86-common.inc + + +PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}" + +MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi" + +KERNEL_IMAGETYPE = "bzImage" + +IMAGE_FSTYPES ?= "tar.gz ext4" + +SERIAL_CONSOLE = "38400 ttyS0" +MACHINE_CONSOLE = "console=ttyS0,38400n8" + +# We bypass swrast but we need it to be present for X to load correctly +XSERVER ?= "xserver-xf86-dri-lite \ + mesa-dri-driver-swrast \ + xf86-input-vmmouse \ + xf86-input-keyboard \ + xf86-input-evdev \ + xf86-video-vmware" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\ + busybox-ifplugd linux-firmware-rtl-nic " + +MACHINEOVERRIDES = "${MACHINE}:sysmocom-bsc"