diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-odu/defconfig b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-odu/defconfig index 7c585cb0ca..74fef38b53 100644 --- a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-odu/defconfig +++ b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-odu/defconfig @@ -7,6 +7,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_BLK_DEV_INITRD=y +CONFIG_CGROUPS=y # CONFIG_PERF_EVENTS is not set CONFIG_SLAB=y CONFIG_PROFILING=y diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_3.2.bb b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_3.2.bb index f84bba1eff..c0b30fff99 100644 --- a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -15,7 +15,6 @@ SRCREV = "bcc4fa827be7f59486ff305d664b42a142025f9b" # odu handling. SRCREV_sysmocom-odu = "f770b4d8361682c9ba80ca3aff17b49461932ccd" -FILES_kernel-image_sysmocom-odu = "" LINUX_VERSION_sysmocom-odu = "3.2.55" PR = "r31" diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb index dc5ed16608..cc77241666 100644 --- a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb @@ -1,6 +1,8 @@ inherit kernel require linux-sysmocom.inc +DEPENDS += "bc-native" + # at versions changes do not forget to update conf/machine/include/sysmobts.inc too LINUX_VERSION ?= "3.10.28" LINUX_VERSION_EXTENSION ?= "-sysmocom-${LINUX_KERNEL_TYPE}" @@ -14,7 +16,7 @@ BTS_FIRMWARE_NAME_sysmobts-2050 = "sysmobts-v2" SRCREV = "ad70d9a96e62bcdbc184512ae375d5d9b5d318d4" -PR = "r31.4" +PR = "r32" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.10 \ diff --git a/meta-sysmocom-bsp/recipes-extra/cifs-utils/cifs-utils_6.2.bb b/meta-sysmocom-bsp/recipes-extra/cifs-utils/cifs-utils_6.2.bb new file mode 100644 index 0000000000..8ca0865cc6 --- /dev/null +++ b/meta-sysmocom-bsp/recipes-extra/cifs-utils/cifs-utils_6.2.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem." +HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils" + +LICENSE = "GPLv3 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PR = "r1" + +SRCREV = "ec983ad90408b689408c2c89179bf8f7b35665a6" +SRC_URI = "git://git.samba.org/cifs-utils.git" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" +# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install_append is needed +PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils" +# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install_append is needed +PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 talloc keyutils" + +inherit autotools pkgconfig + +do_install_append() { + # Remove empty /usr/bin and /usr/sbin directories since the mount helper + # is installed to /sbin + rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} +} + +RRECOMMENDS_${PN} = "kernel-module-cifs" diff --git a/meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_sysmocom.inc b/meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_sysmocom.inc index d6f10d1756..f228105bf0 100644 --- a/meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_sysmocom.inc +++ b/meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_sysmocom.inc @@ -3,27 +3,45 @@ SRCREV = "40d74c99ac9d741857d1298617b186b1d4e148de" PV = "v2011.12+git${SRCPV}" S = "${WORKDIR}/git" -PRINC = "11" +# We can't build the normal build for sysmocom-odu yet.. build the TI branch +SRCREV_sysmocom-odu = "f2dcae2f9e9434392673fea7584641afa98f4232" +UBOOT_MACHINE_sysmocom-odu = "am335x_evm_config" +SPL_BINARY_sysmocom-odu = "MLO" +SPL_UART_BINARY_sysmocom-odu = "u-boot-spl.bin" +SPL_UART_SYMLINK_sysmocom-odu = "${SPL_UART_BINARY}-${MACHINE}" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ - file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90" + +PRINC = "13" + +LIC_FILES_CHKSUM = "file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90" +LIC_FILES_CHKSUM_sysmocom-odu = "file://README;beginline=1;endline=22;md5=2687c5ebfd9cb284491c3204b726ea29" UBOOT_MACHINE_sysmobts-v1 = "davinci_sysmobts_v1_config" UBOOT_MACHINE_sysmobts-v2 = "davinci_sysmobts_v2_config" UBOOT_MACHINE_sysmobts-2050 = "davinci_sysmobts_v2_config" -COMPATIBLE_MACHINE = "(sysmobts-v1|sysmobts-v2|sysmobts-2050)" +COMPATIBLE_MACHINE = "(sysmobts-v1|sysmobts-v2|sysmobts-2050|sysmocom-odu)" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PKGV}-${PKGR}" +UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}" UBOOT_SYMLINK = "u-boot-${MACHINE}" do_deploy_prepend () { - install ${S}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE}.bin - install ${S}/u-boot ${DEPLOYDIR}/${UBOOT_IMAGE}.elf + install ${S}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE}.bin + install ${S}/u-boot ${DEPLOYDIR}/${UBOOT_IMAGE}.elf - cd ${DEPLOYDIR} - rm -f ${UBOOT_SYMLINK}.bin - rm -f ${UBOOT_SYMLINK}.elf - ln -sf ${UBOOT_IMAGE}.bin ${UBOOT_SYMLINK}.bin - ln -sf ${UBOOT_IMAGE}.elf ${UBOOT_SYMLINK}.elf - return + cd ${DEPLOYDIR} + rm -f ${UBOOT_SYMLINK}.bin + rm -f ${UBOOT_SYMLINK}.elf + ln -sf ${UBOOT_IMAGE}.bin ${UBOOT_SYMLINK}.bin + ln -sf ${UBOOT_IMAGE}.elf ${UBOOT_SYMLINK}.elf + + if [ "x${SPL_UART_BINARY}" != "x" ] + then + install ${S}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE} + rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} + ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY} + ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK} + fi + + # Stop the processing now + return }