Merge commit '0fe05716831f895f45f4e22ac911ec1d50744b6d' into dora
This commit is contained in:
commit
24c26bf0f4
|
@ -1,13 +0,0 @@
|
||||||
DESCRIPTION = "sysmocom BSC/E1 image"
|
|
||||||
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
|
|
||||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
|
||||||
|
|
||||||
LICENSE = "MIT"
|
|
||||||
|
|
||||||
inherit boot-directdisk
|
|
||||||
|
|
||||||
|
|
||||||
ROOTFS = "${DEPLOY_DIR_IMAGE}/sysmocom-bsc-e1-image-${MACHINE}.ext3"
|
|
||||||
do_bootdirectdisk[depends] += "sysmocom-bsc-e1-image:do_rootfs"
|
|
||||||
|
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} task-osmocom task-sysmocom \
|
|
||||||
task-sysmocom-debug task-sysmocom-tools task-sysmocom-e1 task-gprscore \
|
|
||||||
e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-e2fsck e2fsprogs-fsck \
|
|
||||||
kernel-module-nls-iso8859-1 kernel-module-nls-cp437"
|
|
||||||
IMAGE_LINGUAS = " "
|
|
||||||
LICENSE = "MIT"
|
|
||||||
|
|
||||||
inherit core-image
|
|
||||||
|
|
||||||
IMAGE_ROOTFS_SIZE = "524288"
|
|
|
@ -1,10 +0,0 @@
|
||||||
DESCRIPTION = "sysmocom BSC/IP image"
|
|
||||||
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
|
|
||||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
|
||||||
|
|
||||||
LICENSE = "MIT"
|
|
||||||
|
|
||||||
inherit boot-directdisk
|
|
||||||
|
|
||||||
ROOTFS = "${DEPLOY_DIR_IMAGE}/sysmocom-bsc-ip-image-${MACHINE}.ext4"
|
|
||||||
do_bootdirectdisk[depends] += "sysmocom-bsc-ip-image:do_rootfs"
|
|
|
@ -1,7 +0,0 @@
|
||||||
IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} task-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools task-gprscore sysmocom-udhcpd-config busybox-udhcpd"
|
|
||||||
IMAGE_LINGUAS = " "
|
|
||||||
LICENSE = "MIT"
|
|
||||||
|
|
||||||
inherit core-image
|
|
||||||
|
|
||||||
IMAGE_ROOTFS_SIZE = "262144"
|
|
|
@ -3,11 +3,11 @@ LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
|
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
|
||||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||||
ALLOW_EMPTY_${PN} = "1"
|
ALLOW_EMPTY_${PN} = "1"
|
||||||
PR = "r11"
|
PR = "r12"
|
||||||
|
|
||||||
RDEPENDS_${PN} = "\
|
RDEPENDS_${PN} = "\
|
||||||
task-sysmocom-tools \
|
task-sysmocom-tools \
|
||||||
task-sysmocom-debug \
|
task-sysmocom-debug \
|
||||||
minicom vlan patch procps psmisc \
|
minicom vlan patch procps psmisc \
|
||||||
ppp rsync sed usbutils openvpn iperf \
|
ppp rsync sed usbutils openvpn iperf \
|
||||||
lcr cronie"
|
lcr cronie iproute2"
|
||||||
|
|
|
@ -76,6 +76,7 @@ CONFIG_PACKET=y
|
||||||
CONFIG_UNIX=y
|
CONFIG_UNIX=y
|
||||||
CONFIG_INET=y
|
CONFIG_INET=y
|
||||||
CONFIG_IP_MULTICAST=y
|
CONFIG_IP_MULTICAST=y
|
||||||
|
CONFIG_IP_ADVANCED_ROUTER=y
|
||||||
CONFIG_IP_PNP=y
|
CONFIG_IP_PNP=y
|
||||||
CONFIG_IP_PNP_DHCP=y
|
CONFIG_IP_PNP_DHCP=y
|
||||||
CONFIG_IP_PNP_BOOTP=y
|
CONFIG_IP_PNP_BOOTP=y
|
||||||
|
@ -87,13 +88,75 @@ CONFIG_IP_PNP_RARP=y
|
||||||
# CONFIG_INET_DIAG is not set
|
# CONFIG_INET_DIAG is not set
|
||||||
# CONFIG_IPV6 is not set
|
# CONFIG_IPV6 is not set
|
||||||
CONFIG_NETFILTER=y
|
CONFIG_NETFILTER=y
|
||||||
CONFIG_NF_CONNTRACK=y
|
CONFIG_NF_CONNTRACK=m
|
||||||
CONFIG_NF_CONNTRACK_IPV4=y
|
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
|
||||||
CONFIG_IP_NF_IPTABLES=y
|
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
|
||||||
CONFIG_IP_NF_FILTER=y
|
CONFIG_NETFILTER_XT_TARGET_CT=m
|
||||||
CONFIG_IP_NF_TARGET_LOG=y
|
CONFIG_NETFILTER_XT_TARGET_DSCP=m
|
||||||
CONFIG_NF_NAT=y
|
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
|
||||||
CONFIG_IP_NF_TARGET_MASQUERADE=y
|
CONFIG_NETFILTER_XT_TARGET_MARK=m
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_TEE=m
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_TRACE=m
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
|
||||||
|
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_CPU=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_DCCP=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_DSCP=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_ESP=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_HELPER=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_MAC=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_MARK=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_OSF=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_OWNER=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_REALM=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_RECENT=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_SCTP=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_STATE=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_STRING=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_TIME=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_U32=m
|
||||||
|
CONFIG_NF_CONNTRACK_IPV4=m
|
||||||
|
CONFIG_IP_NF_IPTABLES=m
|
||||||
|
CONFIG_IP_NF_MATCH_AH=m
|
||||||
|
CONFIG_IP_NF_MATCH_ECN=m
|
||||||
|
CONFIG_IP_NF_MATCH_TTL=m
|
||||||
|
CONFIG_IP_NF_FILTER=m
|
||||||
|
CONFIG_IP_NF_TARGET_REJECT=m
|
||||||
|
CONFIG_IP_NF_TARGET_LOG=m
|
||||||
|
CONFIG_IP_NF_TARGET_ULOG=m
|
||||||
|
CONFIG_NF_NAT=m
|
||||||
|
CONFIG_IP_NF_TARGET_MASQUERADE=m
|
||||||
|
CONFIG_IP_NF_TARGET_NETMAP=m
|
||||||
|
CONFIG_IP_NF_TARGET_REDIRECT=m
|
||||||
|
CONFIG_IP_NF_MANGLE=m
|
||||||
|
CONFIG_IP_NF_TARGET_CLUSTERIP=m
|
||||||
|
CONFIG_IP_NF_TARGET_ECN=m
|
||||||
|
CONFIG_IP_NF_TARGET_TTL=m
|
||||||
|
CONFIG_IP_NF_RAW=m
|
||||||
|
CONFIG_IP_NF_SECURITY=m
|
||||||
|
CONFIG_IP_NF_ARPTABLES=m
|
||||||
|
CONFIG_IP_NF_ARPFILTER=m
|
||||||
|
CONFIG_IP_NF_ARP_MANGLE=m
|
||||||
CONFIG_CAN=y
|
CONFIG_CAN=y
|
||||||
CONFIG_CAN_RAW=y
|
CONFIG_CAN_RAW=y
|
||||||
CONFIG_CAN_BCM=y
|
CONFIG_CAN_BCM=y
|
||||||
|
|
|
@ -14,10 +14,10 @@ BTS_FIRMWARE_NAME_sysmobts-2050 = "sysmobts-v2"
|
||||||
SRCREV = "bcc4fa827be7f59486ff305d664b42a142025f9b"
|
SRCREV = "bcc4fa827be7f59486ff305d664b42a142025f9b"
|
||||||
|
|
||||||
# odu handling.
|
# odu handling.
|
||||||
SRCREV_sysmocom-odu = "6e6273dd4e6c29f9ed23e898393a3ab89647ef15"
|
SRCREV_sysmocom-odu = "aadf22be50ac2abb2a9437b9ad3bba4ccdca540b"
|
||||||
LINUX_VERSION_sysmocom-odu = "3.2.63"
|
LINUX_VERSION_sysmocom-odu = "3.2.63"
|
||||||
|
|
||||||
PR = "r35"
|
PR = "r37"
|
||||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
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=v3.2 \
|
||||||
|
|
|
@ -854,7 +854,7 @@ CONFIG_UDHCP_DEBUG=0
|
||||||
# CONFIG_FEATURE_UDHCP_8021Q is not set
|
# CONFIG_FEATURE_UDHCP_8021Q is not set
|
||||||
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
|
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
|
||||||
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
|
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
|
||||||
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
|
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"
|
||||||
# CONFIG_UDPSVD is not set
|
# CONFIG_UDPSVD is not set
|
||||||
# CONFIG_VCONFIG is not set
|
# CONFIG_VCONFIG is not set
|
||||||
CONFIG_WGET=y
|
CONFIG_WGET=y
|
||||||
|
|
|
@ -854,7 +854,7 @@ CONFIG_UDHCP_DEBUG=0
|
||||||
# CONFIG_FEATURE_UDHCP_8021Q is not set
|
# CONFIG_FEATURE_UDHCP_8021Q is not set
|
||||||
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
|
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
|
||||||
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
|
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
|
||||||
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
|
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"
|
||||||
# CONFIG_UDPSVD is not set
|
# CONFIG_UDPSVD is not set
|
||||||
# CONFIG_VCONFIG is not set
|
# CONFIG_VCONFIG is not set
|
||||||
CONFIG_WGET=y
|
CONFIG_WGET=y
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
|
SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
|
||||||
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:"
|
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:"
|
||||||
PRINC = "21"
|
PRINC = "22"
|
||||||
|
|
||||||
SRC_URI += "file://busybox-ifplugd.sh \
|
SRC_URI += "file://busybox-ifplugd.sh \
|
||||||
file://ifplugd.sh"
|
file://ifplugd.sh"
|
||||||
|
|
|
@ -776,7 +776,7 @@ CONFIG_UDHCP_DEBUG=0
|
||||||
# CONFIG_FEATURE_UDHCP_RFC3397 is not set
|
# CONFIG_FEATURE_UDHCP_RFC3397 is not set
|
||||||
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
|
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
|
||||||
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
|
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
|
||||||
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
|
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"
|
||||||
# CONFIG_VCONFIG is not set
|
# CONFIG_VCONFIG is not set
|
||||||
CONFIG_WGET=y
|
CONFIG_WGET=y
|
||||||
CONFIG_FEATURE_WGET_STATUSBAR=y
|
CONFIG_FEATURE_WGET_STATUSBAR=y
|
||||||
|
|
Loading…
Reference in New Issue