From f028093d924accb6ba9f56d48ac7275f017c88ed Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Sep 2014 20:59:19 +0200 Subject: [PATCH] sysmobts-2050: These files were never used with edison, remove 2050 We have changed the strategy to support multiple BTS with a single build but don't remove support from files that are used with Edison. Linux 3.10 and systemd were not used with edison though. So we can remove it. As the sysmobts-2050 extended the sysmobts-v2 build most of the -sysmobts-2050 changes are not needed anyway. --- recipes-bsp/linux/linux-sysmocom_git.bb | 3 +-- recipes-fixes/systemd/systemd_sysmocom.inc | 15 --------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index 5155fe1..5dd674f 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -12,7 +12,6 @@ BTS_FIRMWARE_NAME_sysmobts-v1 = "sysmobts-v1" # Overrides for the sysmocom bts v2 BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2" -BTS_FIRMWARE_NAME_sysmobts-2050 = "sysmobts-v2" SRCREV = "9610e792ffde7fb2599d19ca6d2a03230f2043c6" @@ -27,7 +26,7 @@ SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3 S = "${WORKDIR}/git" -COMPATIBLE_MACHINE = "(sysmobts-v1|sysmobts-v2|sysmobts-2050|sysmocom-bsc)" +COMPATIBLE_MACHINE = "(sysmobts-v1|sysmobts-v2|sysmocom-bsc)" EXTRA_OEMAKE += "KALLSYMS_EXTRA_PASS=1" # we do not want to have the kernel image inside the kernel diff --git a/recipes-fixes/systemd/systemd_sysmocom.inc b/recipes-fixes/systemd/systemd_sysmocom.inc index f73361e..6836395 100644 --- a/recipes-fixes/systemd/systemd_sysmocom.inc +++ b/recipes-fixes/systemd/systemd_sysmocom.inc @@ -10,7 +10,6 @@ SRC_URI += "file://journald.conf \ SRC_URI_append_sysmobts-v1 = " file://system.conf" SRC_URI_append_sysmobts-v2 = " file://system.conf" -SRC_URI_append_sysmobts-2050 = " file://system.conf" # Disable depedency on dbus RDEPENDS_${PN}_remove = "dbus" @@ -44,20 +43,6 @@ pkg_postinst_${PN}_append () { systemctl ${OPTS} mask systemd-journal-flush.service } -pkg_postinst_${PN}_append_sysmobts-2050 () { - cd $D${sysconfdir}/init.d - - echo "Disabling ttyS0 for sysmobts-2050:" - - OPTS="" - - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - - systemctl ${OPTS} mask serial-getty@ttyS0.service -} - do_install_append() { install -m 0644 ${WORKDIR}/journald.conf ${D}${sysconfdir}/systemd/