Compare commits
58 Commits
daniel/oc2
...
201705
Author | SHA1 | Date |
---|---|---|
Oliver Smith | 7a2e31aa6b | |
Pau Espin | 7898066cc6 | |
Pau Espin | b66e0ec846 | |
Pau Espin | 4f81666c78 | |
Oliver Smith | 62233ca068 | |
Oliver Smith | 9c9857bc26 | |
Oliver Smith | cc8ad7cde7 | |
Oliver Smith | fc7d6d4ae2 | |
Oliver Smith | ce45a5bc79 | |
Oliver Smith | 7b7e522ccf | |
Oliver Smith | 3140454c3c | |
Oliver Smith | 7588bee7fa | |
Oliver Smith | d69834d507 | |
Oliver Smith | 89f6d2b1f0 | |
Harald Welte | d950005138 | |
Oliver Smith | fae46a5d5a | |
Oliver Smith | 0543e7992b | |
Oliver Smith | f9db945110 | |
Pau Espin | 1778f7f9d9 | |
Oliver Smith | ec0d529df0 | |
Pau Espin | 3fc844e59a | |
Pau Espin | 9a554791fe | |
Oliver Smith | b8f13e3224 | |
Oliver Smith | ea8cea6735 | |
Oliver Smith | 53dc1b9dfb | |
Pau Espin | accc8c4289 | |
Pau Espin | 705488de0c | |
Pau Espin | f9fba03b36 | |
Pau Espin | c0ec9b62e7 | |
Harald Welte | 9b11700f57 | |
Oliver Smith | d8cb7e21d0 | |
Harald Welte | b417110988 | |
Harald Welte | 8b9e304c23 | |
Harald Welte | 929e09d631 | |
Oliver Smith | 5631ba69b5 | |
Pau Espin | 1fbdff091b | |
Harald Welte | 42dbc46c36 | |
Oliver Smith | 50145d6174 | |
Harald Welte | 2b77d822e7 | |
Harald Welte | e862cd6912 | |
Oliver Smith | cbc0de86f4 | |
Harald Welte | dbe8d4b62e | |
Oliver Smith | acfacf68ae | |
Harald Welte | 235563c6b0 | |
Pau Espin | c75d0fe631 | |
Pau Espin | c99aa75ef8 | |
Pau Espin Pedrol | 7f34bf633c | |
Pau Espin Pedrol | 70f5062cf1 | |
Pau Espin Pedrol | 48182a62b9 | |
Pau Espin | 7d16100fd6 | |
Daniel Willmann | af88d3a232 | |
Daniel Willmann | 4fe1cbe60b | |
Daniel Willmann | 6d5321eefb | |
Daniel Willmann | 702c59f211 | |
Daniel Willmann | 75693575e6 | |
Pau Espin | cccb44822a | |
Pau Espin | 14dc7f23b4 | |
Daniel Willmann | 50579753a0 |
|
@ -21,8 +21,8 @@ KERNEL_IMAGETYPE = "bzImage"
|
||||||
|
|
||||||
IMAGE_FSTYPES ?= "tar.gz ext4"
|
IMAGE_FSTYPES ?= "tar.gz ext4"
|
||||||
|
|
||||||
SERIAL_CONSOLE = "38400 ttyS0"
|
SERIAL_CONSOLE = "115200 ttyS0"
|
||||||
MACHINE_CONSOLE = "console=ttyS0,38400n8"
|
MACHINE_CONSOLE = "console=ttyS0,115200n8"
|
||||||
|
|
||||||
# We bypass swrast but we need it to be present for X to load correctly
|
# We bypass swrast but we need it to be present for X to load correctly
|
||||||
XSERVER ?= "xserver-xf86-dri-lite \
|
XSERVER ?= "xserver-xf86-dri-lite \
|
||||||
|
|
|
@ -3,3 +3,5 @@ MACHINEOVERRIDES = "${MACHINE}:sysmocom-bsc"
|
||||||
MACHINE_EXTRA_RDEPENDS = "\
|
MACHINE_EXTRA_RDEPENDS = "\
|
||||||
dnsmasq \
|
dnsmasq \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
DISTRO_FEATURES_append = " iu "
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
require sysmocom-image.inc
|
require sysmocom-image.inc
|
||||||
|
|
||||||
IMAGE_INSTALL_append = " task-sysmocom "
|
IMAGE_INSTALL_append = " task-sysmocom-cs task-gprscore "
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
require sysmocom-image.inc
|
||||||
|
|
||||||
|
IMAGE_INSTALL_append = " task-sysmocom-cs osmo-sip-connector "
|
||||||
|
|
||||||
|
# osmo-pcu is included in sysmobts targets due to machine .conf depending on
|
||||||
|
# task-sysmocom-bts. Since we only want voice here, let's disable osmo-pcu and
|
||||||
|
# be done with it:
|
||||||
|
disable_systemd_osmo_pcu() {
|
||||||
|
rm -f ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/osmo-pcu.service
|
||||||
|
}
|
||||||
|
IMAGE_PREPROCESS_COMMAND += "disable_systemd_osmo_pcu "
|
|
@ -3,17 +3,7 @@ etc/ifplugd.sh
|
||||||
etc/network/interfaces
|
etc/network/interfaces
|
||||||
etc/openvpn
|
etc/openvpn
|
||||||
etc/opkg/sysmocom-config.conf
|
etc/opkg/sysmocom-config.conf
|
||||||
etc/osmocom/osmo-mgw.cfg
|
etc/osmocom
|
||||||
etc/osmocom/osmo-bsc.cfg
|
|
||||||
etc/osmocom/osmo-bts.cfg
|
|
||||||
etc/osmocom/osmo-msc.cfg
|
|
||||||
etc/osmocom/osmo-pcu.cfg
|
|
||||||
etc/osmocom/osmo-sgsn.cfg
|
|
||||||
etc/osmocom/osmo-ggsn.cfg
|
|
||||||
etc/osmocom/osmo-stp.cfg
|
|
||||||
etc/osmocom/osmo-hlr.cfg
|
|
||||||
etc/osmocom/osmo-hnbgw.cfg
|
|
||||||
etc/osmocom/sysmobts-mgr.cfg
|
|
||||||
etc/default
|
etc/default
|
||||||
var/lib/osmocom/hlr.db
|
var/lib/osmocom/hlr.db
|
||||||
etc/lcr
|
etc/lcr
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
DESCRIPTION = "sysmocom config backup and restore scripts"
|
DESCRIPTION = "sysmocom config backup and restore scripts"
|
||||||
LICENSE = "GPLv3+"
|
LICENSE = "GPLv3+"
|
||||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||||
PR = "r15"
|
PR = "r16"
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
file://sysmocom-backup \
|
file://sysmocom-backup \
|
||||||
|
|
|
@ -4,11 +4,9 @@ LIC_FILES_CHKSUM = " \
|
||||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||||
DEPENDS = "virtual/kernel"
|
DEPENDS = "virtual/kernel"
|
||||||
ALLOW_EMPTY_${PN} = "1"
|
ALLOW_EMPTY_${PN} = "1"
|
||||||
PR = "r16"
|
PR = "r0"
|
||||||
|
|
||||||
RDEPENDS_${PN} = "\
|
RDEPENDS_${PN} = "\
|
||||||
task-sysmocom-tools \
|
|
||||||
task-gprscore \
|
|
||||||
osmo-bsc \
|
osmo-bsc \
|
||||||
osmo-mgw \
|
osmo-mgw \
|
||||||
osmo-msc \
|
osmo-msc \
|
|
@ -3,20 +3,54 @@ LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = " \
|
LIC_FILES_CHKSUM = " \
|
||||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||||
ALLOW_EMPTY_${PN} = "1"
|
ALLOW_EMPTY_${PN} = "1"
|
||||||
PR = "r22"
|
PR = "r25"
|
||||||
|
|
||||||
RDEPENDS_${PN} = "\
|
RDEPENDS_${PN} = "\
|
||||||
task-sysmocom-tools \
|
task-sysmocom-tools \
|
||||||
task-sysmocom-debug \
|
task-sysmocom-debug \
|
||||||
task-sysmocom-legacy \
|
task-sysmocom-legacy \
|
||||||
minicom vlan patch procps psmisc \
|
task-gprscore \
|
||||||
ppp rsync sed usbutils openvpn iperf \
|
packagegroup-sysmobts-sob \
|
||||||
lcr cronie iproute2 i2c-tools cu \
|
sysmocom-openvpn-config \
|
||||||
python-pyserial python-pexpect bridge-utils \
|
minicom \
|
||||||
pciutils nfacct logrotate dnsmasq ifupdown \
|
vlan \
|
||||||
logrotate python-jsonrpclib python-enum iputils \
|
patch \
|
||||||
packagegroup-sysmobts-sob rtl8169-eeprom autossh \
|
procps \
|
||||||
perl libdbd-sqlite-perl libdbi-perl libjson-perl \
|
psmisc \
|
||||||
netcat-openbsd perf lksctp-tools task-gprscore \
|
ppp \
|
||||||
osmo-sip-connector osmo-sysmon \
|
rsync \
|
||||||
|
sed \
|
||||||
|
usbutils \
|
||||||
|
openvpn \
|
||||||
|
iperf \
|
||||||
|
lcr \
|
||||||
|
cronie \
|
||||||
|
iproute2 \
|
||||||
|
i2c-tools \
|
||||||
|
cu \
|
||||||
|
python-pyserial \
|
||||||
|
python-pexpect \
|
||||||
|
bridge-utils \
|
||||||
|
pciutils \
|
||||||
|
nfacct \
|
||||||
|
logrotate \
|
||||||
|
dnsmasq \
|
||||||
|
ifupdown \
|
||||||
|
logrotate \
|
||||||
|
python-jsonrpclib \
|
||||||
|
python-enum \
|
||||||
|
iputils \
|
||||||
|
rtl8169-eeprom \
|
||||||
|
autossh \
|
||||||
|
perl \
|
||||||
|
libdbd-sqlite-perl \
|
||||||
|
libdbi-perl \
|
||||||
|
libjson-perl \
|
||||||
|
netcat-openbsd \
|
||||||
|
perf \
|
||||||
|
lksctp-tools \
|
||||||
|
osmo-sip-connector \
|
||||||
|
osmo-sysmon \
|
||||||
|
osmo-pcap \
|
||||||
|
nfs-utils \
|
||||||
"
|
"
|
||||||
|
|
|
@ -8,8 +8,5 @@ PR = "r1"
|
||||||
|
|
||||||
RDEPENDS_${PN} = "\
|
RDEPENDS_${PN} = "\
|
||||||
task-sysmocom-tools \
|
task-sysmocom-tools \
|
||||||
osmo-bsc-sccplite \
|
|
||||||
osmo-bsc-nat \
|
|
||||||
osmo-gbproxy \
|
osmo-gbproxy \
|
||||||
osmo-nitb \
|
|
||||||
"
|
"
|
||||||
|
|
|
@ -3,7 +3,7 @@ LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = " \
|
LIC_FILES_CHKSUM = " \
|
||||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||||
ALLOW_EMPTY_${PN} = "1"
|
ALLOW_EMPTY_${PN} = "1"
|
||||||
PR = "r12"
|
PR = "r14"
|
||||||
|
|
||||||
RDEPENDS_${PN} = "\
|
RDEPENDS_${PN} = "\
|
||||||
lmsensors-scripts \
|
lmsensors-scripts \
|
||||||
|
@ -20,4 +20,5 @@ RDEPENDS_${PN} = "\
|
||||||
sysmocom-backup-default \
|
sysmocom-backup-default \
|
||||||
sysmocom-systemd \
|
sysmocom-systemd \
|
||||||
sysmocom-configure \
|
sysmocom-configure \
|
||||||
|
osmo-config-merge \
|
||||||
"
|
"
|
||||||
|
|
|
@ -2,7 +2,7 @@ require barebox.inc
|
||||||
|
|
||||||
SRCREV = "ce8849b03a40718fdaa9d7fc30312eeeb0fafcac"
|
SRCREV = "ce8849b03a40718fdaa9d7fc30312eeeb0fafcac"
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://git.sysmocom.de/barebox.git;branch=v2015.06 \
|
git://gitea.sysmocom.de/sysmo-bts/barebox.git;protocol=https;branch=v2015.06 \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ RDEPENDS_${PN} += "${PN}-mlo"
|
||||||
|
|
||||||
SRCREV = "ec82959f054af3e4a27267290905cfd895f75331"
|
SRCREV = "ec82959f054af3e4a27267290905cfd895f75331"
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://git.sysmocom.de/barebox.git;branch=v2015.06 \
|
git://gitea.sysmocom.de/sysmo-bts/barebox.git;protocol=https;branch=v2015.06 \
|
||||||
file://0001-OWHW-HACK-hard-code-the-bootstate-backend-node.patch \
|
file://0001-OWHW-HACK-hard-code-the-bootstate-backend-node.patch \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
"
|
"
|
||||||
|
|
|
@ -2,7 +2,7 @@ require barebox.inc
|
||||||
|
|
||||||
SRCREV = "d87c27d7ab143d58f358df5722be2b9675103d2e"
|
SRCREV = "d87c27d7ab143d58f358df5722be2b9675103d2e"
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://git.sysmocom.de/barebox.git;branch=v2015.06 \
|
git://gitea.sysmocom.de/sysmo-bts/barebox.git;protocol=https;branch=v2015.06 \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ require barebox.inc
|
||||||
|
|
||||||
SRCREV = "34a48171a699560d8a41d00d2c07ed37a79c00d8"
|
SRCREV = "34a48171a699560d8a41d00d2c07ed37a79c00d8"
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://git.sysmocom.de/barebox.git;branch=v2015.06 \
|
git://gitea.sysmocom.de/sysmo-bts/barebox.git;protocol=https;branch=v2015.06 \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ RDEPENDS_${PN} += "${PN}-mlo"
|
||||||
|
|
||||||
SRCREV = "34a48171a699560d8a41d00d2c07ed37a79c00d8"
|
SRCREV = "34a48171a699560d8a41d00d2c07ed37a79c00d8"
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://git.sysmocom.de/barebox.git;branch=v2015.06 \
|
git://gitea.sysmocom.de/sysmo-bts/barebox.git;protocol=https;branch=v2015.06 \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
|
THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
|
||||||
FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
|
FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
|
||||||
|
|
||||||
PRINC="4"
|
PRINC="5"
|
||||||
|
|
||||||
dirs755_append_oc2g = "/mnt/rom /mnt/rom/factory"
|
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
/dev/root / auto defaults 1 1
|
|
||||||
proc /proc proc defaults 0 0
|
|
||||||
devpts /dev/pts devpts mode=0620,gid=5 0 0
|
|
||||||
tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0
|
|
||||||
tmpfs /var/volatile tmpfs defaults 0 0
|
|
||||||
|
|
||||||
/dev/mtdblock8 /mnt/rom/factory jffs2 ro,sync,noatime,nofail 0 0
|
|
||||||
#/dev/mmcblk0p4 /mnt/storage ext4 defaults,noatime,nofail 0 0
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ HOMEPAGE = "http://sourceforge.net/projects/b-o-s-s-a/"
|
||||||
LICENSE = "GPLv3"
|
LICENSE = "GPLv3"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"
|
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"
|
||||||
SRCREV = "05bfcc39bc0453c3028b1161175b95a81af7a901"
|
SRCREV = "05bfcc39bc0453c3028b1161175b95a81af7a901"
|
||||||
SRC_URI = "git://git.code.sf.net/p/b-o-s-s-a/code"
|
SRC_URI = "git://git.code.sf.net/p/b-o-s-s-a/code;protocol=https"
|
||||||
DEPENDS = "readline"
|
DEPENDS = "readline"
|
||||||
|
|
||||||
PV = "v0.0+git${SRCPV}"
|
PV = "v0.0+git${SRCPV}"
|
||||||
|
|
|
@ -4,7 +4,7 @@ LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=e6868d1ce8f058ecc5658ecebb086636"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=e6868d1ce8f058ecc5658ecebb086636"
|
||||||
|
|
||||||
SRCREV = "1103417819fe855d8d0d3e6a277870679ad01bd2"
|
SRCREV = "1103417819fe855d8d0d3e6a277870679ad01bd2"
|
||||||
SRC_URI = "git://github.com/mlaurijsse/linux-mpu9150.git"
|
SRC_URI = "git://github.com/mlaurijsse/linux-mpu9150;protocol=https"
|
||||||
|
|
||||||
PV = "v0.0+git${SRCPV}"
|
PV = "v0.0+git${SRCPV}"
|
||||||
PR = "r1a"
|
PR = "r1a"
|
||||||
|
|
|
@ -18,7 +18,7 @@ SRCREV = "60c9ebbd1a683e8691223042a12958c5dc661feb"
|
||||||
PR = "r43"
|
PR = "r43"
|
||||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
PV = "${LINUX_VERSION}+git${SRCPV}"
|
||||||
|
|
||||||
SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3.10.84 \
|
SRC_URI = "git://gitea.sysmocom.de/sysmo-bts/linux.git;protocol=https;branch=linux-3.10.84 \
|
||||||
file://defconfig"
|
file://defconfig"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
|
@ -14,7 +14,7 @@ PR = "r43"
|
||||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
PV = "${LINUX_VERSION}+git${SRCPV}"
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=${BRANCH} \
|
git://gitea.sysmocom.de/sysmo-bts/linux.git;protocol=https;branch=${BRANCH} \
|
||||||
file://mISDN_loop.patch;patch=1 \
|
file://mISDN_loop.patch;patch=1 \
|
||||||
file://defconfig"
|
file://defconfig"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
|
@ -18,7 +18,7 @@ SRCREV = "27afed74546b4fa5546aeea26128eae2dcdc7c1f"
|
||||||
PR = "r6"
|
PR = "r6"
|
||||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
PV = "${LINUX_VERSION}+git${SRCPV}"
|
||||||
|
|
||||||
SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=tracking/linux-stable-4.9 \
|
SRC_URI = "git://gitea.sysmocom.de/sysmo-bts/linux.git;protocol=https;branch=tracking/linux-stable-4.9 \
|
||||||
file://defconfig"
|
file://defconfig"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
|
@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||||
DEPENDS = "pciutils"
|
DEPENDS = "pciutils"
|
||||||
|
|
||||||
SRCREV = "2052514dc99575140af40b25e41c438c98eb9b48"
|
SRCREV = "2052514dc99575140af40b25e41c438c98eb9b48"
|
||||||
SRC_URI = "git://git.sysmocom.de/rtl8168-eeprom;protocol=git;branch=master"
|
SRC_URI = "git://gitea.sysmocom.de/sysmocom/rtl8168-eeprom.git;protocol=https;branch=master"
|
||||||
PV = "v0.0.1+git${SRCPV}"
|
PV = "v0.0.1+git${SRCPV}"
|
||||||
PR = "r0"
|
PR = "r0"
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
#OpenVPN client conf
|
#OpenVPN client conf
|
||||||
tls-client
|
tls-client
|
||||||
client
|
client
|
||||||
ns-cert-type server
|
remote-cert-tls server
|
||||||
dev tun
|
dev tun
|
||||||
proto udp
|
proto udp
|
||||||
tun-mtu 1500
|
tun-mtu 1500
|
||||||
remote admin.sysmocom.de
|
remote vpn.sysmocom.de
|
||||||
remote 78.46.147.238
|
|
||||||
comp-lzo
|
comp-lzo
|
||||||
pkcs12 sysmocom-client-cert.p12
|
pkcs12 sysmocom-client-cert.p12
|
||||||
cipher BF-CBC
|
cipher AES-256-CBC
|
||||||
|
nobind
|
||||||
|
|
|
@ -5,21 +5,12 @@ LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||||
|
|
||||||
SRC_URI = "file://sysmocom-vpn.conf"
|
SRC_URI = "file://sysmocom-vpn.conf"
|
||||||
PR = "r4"
|
PR = "r7"
|
||||||
|
|
||||||
CONFFILES_${PN} = "${sysconfdir}/openvpn/sysmocom-vpn.conf.off"
|
CONFFILES_${PN} = "${sysconfdir}/openvpn/sysmocom-vpn.conf"
|
||||||
PACKAGE_ARCH = "all"
|
PACKAGE_ARCH = "all"
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
install -d ${D}${sysconfdir}/openvpn
|
install -d ${D}${sysconfdir}/openvpn
|
||||||
install -m 0644 ${WORKDIR}/sysmocom-vpn.conf ${D}${sysconfdir}/openvpn/sysmocom-vpn.conf.off
|
install -m 0644 ${WORKDIR}/sysmocom-vpn.conf ${D}${sysconfdir}/openvpn
|
||||||
}
|
|
||||||
|
|
||||||
# Always enable the OpenVPN service. This assumes that
|
|
||||||
# this package will never be inside the nornal sysmocom
|
|
||||||
# feed.
|
|
||||||
FILES_${PN} += "${systemd_unitdir}"
|
|
||||||
do_install_append() {
|
|
||||||
install -d ${D}${systemd_system_unitdir}/multi-user.target.wants/
|
|
||||||
ln -sf ../openvpn.service ${D}${systemd_system_unitdir}/multi-user.target.wants/
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
Subject: [PATCH 1/6] urandom-xauth-changes-to-options.h
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
---
|
||||||
|
default_options.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/default_options.h b/default_options.h
|
||||||
|
index 349338c..5ffac25 100644
|
||||||
|
--- a/default_options.h
|
||||||
|
+++ b/default_options.h
|
||||||
|
@@ -289,7 +289,7 @@ group1 in Dropbear server too */
|
||||||
|
|
||||||
|
/* The command to invoke for xauth when using X11 forwarding.
|
||||||
|
* "-q" for quiet */
|
||||||
|
-#define XAUTH_COMMAND "/usr/bin/xauth -q"
|
||||||
|
+#define XAUTH_COMMAND "xauth -q"
|
||||||
|
|
||||||
|
|
||||||
|
/* If you want to enable running an sftp server (such as the one included with
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
|
@ -0,0 +1,41 @@
|
||||||
|
From b8cece92ba19aa77ac013ea161bfe4c7147747c9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||||
|
Date: Wed, 2 Dec 2015 11:36:02 +0200
|
||||||
|
Subject: Enable pam
|
||||||
|
|
||||||
|
We need modify file default_options.h besides enabling pam in
|
||||||
|
configure if we want dropbear to support pam.
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
|
||||||
|
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||||
|
---
|
||||||
|
default_options.h | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/default_options.h b/default_options.h
|
||||||
|
index 0e3d027..349338c 100644
|
||||||
|
--- a/default_options.h
|
||||||
|
+++ b/default_options.h
|
||||||
|
@@ -210,7 +210,7 @@ group1 in Dropbear server too */
|
||||||
|
|
||||||
|
/* Authentication Types - at least one required.
|
||||||
|
RFC Draft requires pubkey auth, and recommends password */
|
||||||
|
-#define DROPBEAR_SVR_PASSWORD_AUTH 1
|
||||||
|
+#define DROPBEAR_SVR_PASSWORD_AUTH 0
|
||||||
|
|
||||||
|
/* Note: PAM auth is quite simple and only works for PAM modules which just do
|
||||||
|
* a simple "Login: " "Password: " (you can edit the strings in svr-authpam.c).
|
||||||
|
@@ -218,7 +218,7 @@ group1 in Dropbear server too */
|
||||||
|
* but there's an interface via a PAM module. It won't work for more complex
|
||||||
|
* PAM challenge/response.
|
||||||
|
* You can't enable both PASSWORD and PAM. */
|
||||||
|
-#define DROPBEAR_SVR_PAM_AUTH 0
|
||||||
|
+#define DROPBEAR_SVR_PAM_AUTH 1
|
||||||
|
|
||||||
|
/* ~/.ssh/authorized_keys authentication.
|
||||||
|
* You must define DROPBEAR_SVR_PUBKEY_AUTH in order to use plugins. */
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
From e3a5db1b6d3f6382a15b2266458c26c645a10f18 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mingli Yu <Mingli.Yu@windriver.com>
|
||||||
|
Date: Thu, 6 Sep 2018 15:54:00 +0800
|
||||||
|
Subject: [PATCH] dropbear configuration file
|
||||||
|
|
||||||
|
dropbear: Change the path ("/etc/pam.d/sshd" as default) to find a pam configuration file \
|
||||||
|
to "/etc/pam.d/dropbear for dropbear when enabling pam supporting"
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
|
Signed-off-by: Maxin B. John <maxin.john@enea.com>
|
||||||
|
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
|
||||||
|
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
|
||||||
|
---
|
||||||
|
svr-authpam.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/svr-authpam.c b/svr-authpam.c
|
||||||
|
index d201bc9..165ec5c 100644
|
||||||
|
--- a/svr-authpam.c
|
||||||
|
+++ b/svr-authpam.c
|
||||||
|
@@ -223,7 +223,7 @@ void svr_auth_pam(int valid_user) {
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Init pam */
|
||||||
|
- if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) {
|
||||||
|
+ if ((rc = pam_start("dropbear", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) {
|
||||||
|
dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s",
|
||||||
|
rc, pam_strerror(pamHandlep, rc));
|
||||||
|
goto cleanup;
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
#%PAM-1.0
|
||||||
|
|
||||||
|
auth include common-auth
|
||||||
|
account include common-account
|
|
@ -0,0 +1,31 @@
|
||||||
|
From c347ece05a7fdbf50d76cb136b9ed45caed333f6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Joseph Reynolds <joseph.reynolds1@ibm.com>
|
||||||
|
Date: Thu, 20 Jun 2019 16:29:15 -0500
|
||||||
|
Subject: [PATCH] dropbear: new feature: disable-weak-ciphers
|
||||||
|
|
||||||
|
This feature disables all CBC, SHA1, and diffie-hellman group1 ciphers
|
||||||
|
in the dropbear ssh server and client since they're considered weak ciphers
|
||||||
|
and we want to support the stong algorithms.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
Signed-off-by: Joseph Reynolds <joseph.reynolds1@ibm.com>
|
||||||
|
---
|
||||||
|
default_options.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/default_options.h b/default_options.h
|
||||||
|
index d417588..bc5200f 100644
|
||||||
|
--- a/default_options.h
|
||||||
|
+++ b/default_options.h
|
||||||
|
@@ -180,7 +180,7 @@ IMPORTANT: Some options will require "make clean" after changes */
|
||||||
|
* Small systems should generally include either curve25519 or ecdh for performance.
|
||||||
|
* curve25519 is less widely supported but is faster
|
||||||
|
*/
|
||||||
|
-#define DROPBEAR_DH_GROUP14_SHA1 1
|
||||||
|
+#define DROPBEAR_DH_GROUP14_SHA1 0
|
||||||
|
#define DROPBEAR_DH_GROUP14_SHA256 1
|
||||||
|
#define DROPBEAR_DH_GROUP16 0
|
||||||
|
#define DROPBEAR_CURVE25519 1
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
# Disallow root logins by default
|
||||||
|
DROPBEAR_EXTRA_ARGS="-w"
|
|
@ -0,0 +1,10 @@
|
||||||
|
[Unit]
|
||||||
|
Conflicts=dropbear.service
|
||||||
|
|
||||||
|
[Socket]
|
||||||
|
ListenStream=22
|
||||||
|
Accept=yes
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=sockets.target
|
||||||
|
Also=dropbearkey.service
|
|
@ -0,0 +1,12 @@
|
||||||
|
[Unit]
|
||||||
|
Description=SSH Per-Connection Server
|
||||||
|
Wants=dropbearkey.service
|
||||||
|
After=syslog.target dropbearkey.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear"
|
||||||
|
EnvironmentFile=-/etc/default/dropbear
|
||||||
|
ExecStart=-@SBINDIR@/dropbear -i -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key $DROPBEAR_EXTRA_ARGS
|
||||||
|
ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
|
||||||
|
StandardInput=socket
|
||||||
|
KillMode=process
|
|
@ -0,0 +1,14 @@
|
||||||
|
[Unit]
|
||||||
|
Description=SSH Key Generation
|
||||||
|
RequiresMountsFor=/var /var/lib
|
||||||
|
ConditionPathExists=!/etc/dropbear/dropbear_rsa_host_key
|
||||||
|
ConditionPathExists=!/var/lib/dropbear/dropbear_rsa_host_key
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear"
|
||||||
|
EnvironmentFile=-/etc/default/dropbear
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=@BASE_BINDIR@/mkdir -p ${DROPBEAR_RSAKEY_DIR}
|
||||||
|
ExecStart=@SBINDIR@/dropbearkey -t rsa -f ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key
|
||||||
|
RemainAfterExit=yes
|
||||||
|
Nice=10
|
|
@ -0,0 +1,79 @@
|
||||||
|
#!/bin/sh
|
||||||
|
### BEGIN INIT INFO
|
||||||
|
# Provides: sshd
|
||||||
|
# Required-Start: $remote_fs $syslog $networking
|
||||||
|
# Required-Stop: $remote_fs $syslog
|
||||||
|
# Default-Start: 2 3 4 5
|
||||||
|
# Default-Stop: 1
|
||||||
|
# Short-Description: Dropbear Secure Shell server
|
||||||
|
### END INIT INFO
|
||||||
|
#
|
||||||
|
# Do not configure this file. Edit /etc/default/dropbear instead!
|
||||||
|
#
|
||||||
|
|
||||||
|
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
||||||
|
DAEMON=/usr/sbin/dropbear
|
||||||
|
NAME=dropbear
|
||||||
|
DESC="Dropbear SSH server"
|
||||||
|
PIDFILE=/var/run/dropbear.pid
|
||||||
|
|
||||||
|
# These values may be replaced by those from /etc/default/dropbear
|
||||||
|
DROPBEAR_RSAKEY_DIR="/etc/dropbear"
|
||||||
|
DROPBEAR_PORT=22
|
||||||
|
DROPBEAR_EXTRA_ARGS=
|
||||||
|
DROPBEAR_RSAKEY_ARGS=
|
||||||
|
NO_START=0
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
test ! -r /etc/default/dropbear || . /etc/default/dropbear
|
||||||
|
test "$NO_START" = "0" || exit 0
|
||||||
|
test -x "$DAEMON" || exit 0
|
||||||
|
test ! -h /var/service/dropbear || exit 0
|
||||||
|
|
||||||
|
test -z "$DROPBEAR_BANNER" || \
|
||||||
|
DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -b $DROPBEAR_BANNER"
|
||||||
|
test -n "$DROPBEAR_RSAKEY" || \
|
||||||
|
DROPBEAR_RSAKEY="${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key"
|
||||||
|
|
||||||
|
gen_keys() {
|
||||||
|
if [ -f "$DROPBEAR_RSAKEY" -a ! -s "$DROPBEAR_RSAKEY" ]; then
|
||||||
|
rm $DROPBEAR_RSAKEY || true
|
||||||
|
fi
|
||||||
|
if [ ! -f "$DROPBEAR_RSAKEY" ]; then
|
||||||
|
mkdir -p ${DROPBEAR_RSAKEY%/*}
|
||||||
|
dropbearkey -t rsa -f $DROPBEAR_RSAKEY $DROPBEAR_RSAKEY_ARGS
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
echo -n "Starting $DESC: "
|
||||||
|
gen_keys
|
||||||
|
start-stop-daemon -S -p $PIDFILE \
|
||||||
|
-x "$DAEMON" -- -r $DROPBEAR_RSAKEY \
|
||||||
|
-p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
|
||||||
|
echo "$NAME."
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
echo -n "Stopping $DESC: "
|
||||||
|
start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
|
||||||
|
echo "$NAME."
|
||||||
|
;;
|
||||||
|
restart|force-reload)
|
||||||
|
echo -n "Restarting $DESC: "
|
||||||
|
start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
|
||||||
|
sleep 1
|
||||||
|
start-stop-daemon -S -p $PIDFILE \
|
||||||
|
-x "$DAEMON" -- -r $DROPBEAR_RSAKEY \
|
||||||
|
-p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
|
||||||
|
echo "$NAME."
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
N=/etc/init.d/$NAME
|
||||||
|
echo "Usage: $N {start|stop|restart|force-reload}" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
exit 0
|
|
@ -0,0 +1,11 @@
|
||||||
|
# Not provided in our OE packages
|
||||||
|
DEPENDS_remove = "virtual/crypt"
|
||||||
|
|
||||||
|
# Install sftp-server so scp works with the SFTP protocol, which is the default
|
||||||
|
# in recent OpenSSH versions (SYS#6403)
|
||||||
|
RDEPENDS_${PN}_append = " sftp-server"
|
||||||
|
|
||||||
|
do_install_append() {
|
||||||
|
# Do not disable root login by default
|
||||||
|
echo "" > ${D}${sysconfdir}/default/dropbear
|
||||||
|
}
|
|
@ -0,0 +1,133 @@
|
||||||
|
SUMMARY = "A lightweight SSH and SCP implementation"
|
||||||
|
HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
|
||||||
|
DESCRIPTION = "Dropbear is a relatively small SSH server and client. It runs on a variety of POSIX-based platforms. Dropbear is open source software, distributed under a MIT-style license. Dropbear is particularly useful for "embedded"-type Linux (or other Unix) systems, such as wireless routers."
|
||||||
|
SECTION = "console/network"
|
||||||
|
|
||||||
|
# some files are from other projects and have others license terms:
|
||||||
|
# public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY
|
||||||
|
LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD"
|
||||||
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=25cf44512b7bc8966a48b6b1a9b7605f"
|
||||||
|
|
||||||
|
DEPENDS = "zlib virtual/crypt"
|
||||||
|
RPROVIDES_${PN} = "ssh sshd"
|
||||||
|
RCONFLICTS_${PN} = "openssh-sshd openssh"
|
||||||
|
|
||||||
|
SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
|
||||||
|
file://0001-urandom-xauth-changes-to-options.h.patch \
|
||||||
|
file://init \
|
||||||
|
file://dropbearkey.service \
|
||||||
|
file://dropbear@.service \
|
||||||
|
file://dropbear.socket \
|
||||||
|
file://dropbear.default \
|
||||||
|
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
|
||||||
|
${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} \
|
||||||
|
"
|
||||||
|
|
||||||
|
SRC_URI[sha256sum] = "bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b"
|
||||||
|
|
||||||
|
PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
|
||||||
|
file://0006-dropbear-configuration-file.patch \
|
||||||
|
file://dropbear"
|
||||||
|
|
||||||
|
PAM_PLUGINS = "libpam-runtime \
|
||||||
|
pam-plugin-deny \
|
||||||
|
pam-plugin-permit \
|
||||||
|
pam-plugin-unix \
|
||||||
|
"
|
||||||
|
inherit autotools update-rc.d systemd
|
||||||
|
|
||||||
|
CVE_PRODUCT = "dropbear_ssh"
|
||||||
|
|
||||||
|
INITSCRIPT_NAME = "dropbear"
|
||||||
|
INITSCRIPT_PARAMS = "defaults 10"
|
||||||
|
|
||||||
|
SYSTEMD_SERVICE_${PN} = "dropbear.socket"
|
||||||
|
|
||||||
|
SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
|
||||||
|
BINCOMMANDS = "dbclient ssh scp"
|
||||||
|
EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
|
||||||
|
|
||||||
|
PACKAGECONFIG ?= "disable-weak-ciphers ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
|
||||||
|
PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}"
|
||||||
|
PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt"
|
||||||
|
PACKAGECONFIG[disable-weak-ciphers] = ""
|
||||||
|
PACKAGECONFIG[enable-x11-forwarding] = ""
|
||||||
|
|
||||||
|
# This option appends to CFLAGS and LDFLAGS from OE
|
||||||
|
# This is causing [textrel] QA warning
|
||||||
|
EXTRA_OECONF += "--disable-harden"
|
||||||
|
|
||||||
|
# musl does not implement wtmp/logwtmp APIs
|
||||||
|
EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog"
|
||||||
|
|
||||||
|
do_configure_append() {
|
||||||
|
echo "/* Dropbear features */" > ${B}/localoptions.h
|
||||||
|
if ${@bb.utils.contains('PACKAGECONFIG', 'enable-x11-forwarding', 'true', 'false', d)}; then
|
||||||
|
echo "#define DROPBEAR_X11FWD 1" >> ${B}/localoptions.h
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install() {
|
||||||
|
install -d ${D}${sysconfdir} \
|
||||||
|
${D}${sysconfdir}/init.d \
|
||||||
|
${D}${sysconfdir}/default \
|
||||||
|
${D}${sysconfdir}/dropbear \
|
||||||
|
${D}${bindir} \
|
||||||
|
${D}${sbindir} \
|
||||||
|
${D}${localstatedir}
|
||||||
|
|
||||||
|
install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear
|
||||||
|
|
||||||
|
install -m 0755 dropbearmulti ${D}${sbindir}/
|
||||||
|
|
||||||
|
for i in ${BINCOMMANDS}
|
||||||
|
do
|
||||||
|
# ssh and scp symlinks are created by update-alternatives
|
||||||
|
if [ $i = ssh ] || [ $i = scp ]; then continue; fi
|
||||||
|
ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
|
||||||
|
done
|
||||||
|
for i in ${SBINCOMMANDS}
|
||||||
|
do
|
||||||
|
ln -s ./dropbearmulti ${D}${sbindir}/$i
|
||||||
|
done
|
||||||
|
sed -e 's,/etc,${sysconfdir},g' \
|
||||||
|
-e 's,/usr/sbin,${sbindir},g' \
|
||||||
|
-e 's,/var,${localstatedir},g' \
|
||||||
|
-e 's,/usr/bin,${bindir},g' \
|
||||||
|
-e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear
|
||||||
|
chmod 755 ${D}${sysconfdir}/init.d/dropbear
|
||||||
|
if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
|
||||||
|
install -d ${D}${sysconfdir}/pam.d
|
||||||
|
install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/
|
||||||
|
fi
|
||||||
|
|
||||||
|
# deal with systemd unit files
|
||||||
|
install -d ${D}${systemd_system_unitdir}
|
||||||
|
install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_system_unitdir}
|
||||||
|
install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_system_unitdir}
|
||||||
|
install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_system_unitdir}
|
||||||
|
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
|
||||||
|
-e 's,@BINDIR@,${bindir},g' \
|
||||||
|
-e 's,@SBINDIR@,${sbindir},g' \
|
||||||
|
${D}${systemd_system_unitdir}/dropbear.socket ${D}${systemd_system_unitdir}/*.service
|
||||||
|
}
|
||||||
|
|
||||||
|
inherit update-alternatives
|
||||||
|
|
||||||
|
ALTERNATIVE_PRIORITY = "20"
|
||||||
|
ALTERNATIVE_${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}"
|
||||||
|
|
||||||
|
ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti"
|
||||||
|
|
||||||
|
pkg_postrm_${PN} () {
|
||||||
|
if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
|
||||||
|
rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
|
||||||
|
fi
|
||||||
|
if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
|
||||||
|
rm ${sysconfdir}/dropbear/dropbear_dss_host_key
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
CONFFILES_${PN} = "${sysconfdir}/default/dropbear"
|
||||||
|
|
||||||
|
FILES_${PN} += "${bindir}"
|
|
@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap4"
|
||||||
BRANCH ?= "master"
|
BRANCH ?= "master"
|
||||||
SRCREV = "a5dac6c5a65c672bd299b42ca495566a7cc137a4"
|
SRCREV = "a5dac6c5a65c672bd299b42ca495566a7cc137a4"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/omapconf/omapconf.git;protocol=git;branch=${BRANCH}"
|
SRC_URI = "git://github.com/omapconf/omapconf.git;protocol=https;branch=${BRANCH}"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ PR = "r3"
|
||||||
|
|
||||||
SRCREV = "be3291a18c069ae23a124ffdc56d64a5ff0bbec7"
|
SRCREV = "be3291a18c069ae23a124ffdc56d64a5ff0bbec7"
|
||||||
|
|
||||||
SRC_URI = "git://git.code.sf.net/p/atftp/code \
|
SRC_URI = "git://git.code.sf.net/p/atftp/code;protocol=https \
|
||||||
file://atftpd-0.7_circumvent_tftp_size_restrictions.patch \
|
file://atftpd-0.7_circumvent_tftp_size_restrictions.patch \
|
||||||
file://atftpd-0.7_unprotected_assignments_crash.patch \
|
file://atftpd-0.7_unprotected_assignments_crash.patch \
|
||||||
file://atftpd.init \
|
file://atftpd.init \
|
||||||
|
|
|
@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
|
||||||
PR = "r4"
|
PR = "r4"
|
||||||
|
|
||||||
SRC_URI = "\
|
SRC_URI = "\
|
||||||
git://git.pengutronix.de/git/tools/dt-utils.git \
|
git://git.pengutronix.de/git/tools/dt-utils.git;protocol=https \
|
||||||
file://0001-barebox-state-fix-typo.patch \
|
file://0001-barebox-state-fix-typo.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|
|
@ -3,15 +3,15 @@ HOMEPAGE = "http://www.cacert.org/index.php?id=3"
|
||||||
SECTION = "misc"
|
SECTION = "misc"
|
||||||
LICENSE = "RDL-COD14"
|
LICENSE = "RDL-COD14"
|
||||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||||
PR = "r6"
|
PR = "r7"
|
||||||
|
|
||||||
SRC_URI = "file://root.crt file://class3.crt file://DST_Root_CA_X3.pem"
|
SRC_URI = "file://root.crt file://class3.crt file://ISRG_Root_X1.pem"
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
install -d ${D}${libdir}/ssl/certs
|
install -d ${D}${libdir}/ssl/certs
|
||||||
install -m 0644 ${WORKDIR}/root.crt ${D}${libdir}/ssl/certs/cacert.org.pem
|
install -m 0644 ${WORKDIR}/root.crt ${D}${libdir}/ssl/certs/cacert.org.pem
|
||||||
cat ${WORKDIR}/class3.crt >> ${D}${libdir}/ssl/certs/cacert.org.pem
|
cat ${WORKDIR}/class3.crt >> ${D}${libdir}/ssl/certs/cacert.org.pem
|
||||||
install -m 0644 ${WORKDIR}/DST_Root_CA_X3.pem ${D}${libdir}/ssl/certs/
|
install -m 0644 ${WORKDIR}/ISRG_Root_X1.pem ${D}${libdir}/ssl/certs/
|
||||||
|
|
||||||
# Create hash symlinks
|
# Create hash symlinks
|
||||||
cd ${D}${libdir}/ssl/certs
|
cd ${D}${libdir}/ssl/certs
|
||||||
|
@ -19,7 +19,7 @@ do_install() {
|
||||||
ln -s cacert.org.pem 5ed36f99.0
|
ln -s cacert.org.pem 5ed36f99.0
|
||||||
ln -s cacert.org.pem 99d0fa06.0
|
ln -s cacert.org.pem 99d0fa06.0
|
||||||
|
|
||||||
ln -s DST_Root_CA_X3.pem 2e5ac55d.0
|
ln -s ISRG_Root_X1.pem 4042bcee.0
|
||||||
}
|
}
|
||||||
|
|
||||||
FILES_${PN} = "${libdir}/ssl/certs/*"
|
FILES_${PN} = "${libdir}/ssl/certs/*"
|
||||||
|
|
|
@ -0,0 +1,80 @@
|
||||||
|
From cb43ec15b700b25f3c4fe44043a1a021aaf5b768 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
Date: Mon, 18 Oct 2021 12:05:49 +0200
|
||||||
|
Subject: [PATCH] Revert "mozilla/certdata2pem.py: print a warning for expired
|
||||||
|
certificates."
|
||||||
|
|
||||||
|
This avoids a dependency on python3-cryptography, and only checks
|
||||||
|
for expired certs (which is upstream concern, but not ours).
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-core specific]
|
||||||
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
---
|
||||||
|
debian/changelog | 1 -
|
||||||
|
debian/control | 2 +-
|
||||||
|
mozilla/certdata2pem.py | 11 -----------
|
||||||
|
3 files changed, 1 insertion(+), 13 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/debian/changelog b/debian/changelog
|
||||||
|
index 531e4d0..4006509 100644
|
||||||
|
--- a/debian/changelog
|
||||||
|
+++ b/debian/changelog
|
||||||
|
@@ -37,7 +37,6 @@ ca-certificates (20211004) unstable; urgency=low
|
||||||
|
- "Trustis FPS Root CA"
|
||||||
|
- "Staat der Nederlanden Root CA - G3"
|
||||||
|
* Blacklist expired root certificate "DST Root CA X3" (closes: #995432)
|
||||||
|
- * mozilla/certdata2pem.py: print a warning for expired certificates.
|
||||||
|
|
||||||
|
-- Julien Cristau <jcristau@debian.org> Thu, 07 Oct 2021 17:12:47 +0200
|
||||||
|
|
||||||
|
diff --git a/debian/control b/debian/control
|
||||||
|
index 4434b7a..5c6ba24 100644
|
||||||
|
--- a/debian/control
|
||||||
|
+++ b/debian/control
|
||||||
|
@@ -3,7 +3,7 @@ Section: misc
|
||||||
|
Priority: optional
|
||||||
|
Maintainer: Julien Cristau <jcristau@debian.org>
|
||||||
|
Build-Depends: debhelper-compat (= 13), po-debconf
|
||||||
|
-Build-Depends-Indep: python3, openssl, python3-cryptography
|
||||||
|
+Build-Depends-Indep: python3, openssl
|
||||||
|
Standards-Version: 4.5.0.2
|
||||||
|
Vcs-Git: https://salsa.debian.org/debian/ca-certificates.git
|
||||||
|
Vcs-Browser: https://salsa.debian.org/debian/ca-certificates
|
||||||
|
diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py
|
||||||
|
index ede23d4..7d796f1 100644
|
||||||
|
--- a/mozilla/certdata2pem.py
|
||||||
|
+++ b/mozilla/certdata2pem.py
|
||||||
|
@@ -21,16 +21,12 @@
|
||||||
|
# USA.
|
||||||
|
|
||||||
|
import base64
|
||||||
|
-import datetime
|
||||||
|
import os.path
|
||||||
|
import re
|
||||||
|
import sys
|
||||||
|
import textwrap
|
||||||
|
import io
|
||||||
|
|
||||||
|
-from cryptography import x509
|
||||||
|
-
|
||||||
|
-
|
||||||
|
objects = []
|
||||||
|
|
||||||
|
# Dirty file parser.
|
||||||
|
@@ -121,13 +117,6 @@ for obj in objects:
|
||||||
|
if obj['CKA_CLASS'] == 'CKO_CERTIFICATE':
|
||||||
|
if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]:
|
||||||
|
continue
|
||||||
|
-
|
||||||
|
- cert = x509.load_der_x509_certificate(obj['CKA_VALUE'])
|
||||||
|
- if cert.not_valid_after < datetime.datetime.now():
|
||||||
|
- print('!'*74)
|
||||||
|
- print('Trusted but expired certificate found: %s' % obj['CKA_LABEL'])
|
||||||
|
- print('!'*74)
|
||||||
|
-
|
||||||
|
bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\
|
||||||
|
.replace(' ', '_')\
|
||||||
|
.replace('(', '=')\
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
ca-certificates is a package from Debian, but some host distros such as Fedora
|
||||||
|
have a leaner run-parts provided by cron which doesn't support --verbose or the
|
||||||
|
-- separator between arguments and paths.
|
||||||
|
|
||||||
|
This solves errors such as
|
||||||
|
|
||||||
|
| Running hooks in [...]/rootfs/etc/ca-certificates/update.d...
|
||||||
|
| [...]/usr/sbin/update-ca-certificates: line 194: Not: command not found
|
||||||
|
| [...]/usr/sbin/update-ca-certificates: line 230: Not a directory: --: command not found
|
||||||
|
| E: Not a directory: -- exited with code 127.
|
||||||
|
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
|
||||||
|
---
|
||||||
|
sbin/update-ca-certificates | 4 +---
|
||||||
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||||
|
|
||||||
|
Index: git/sbin/update-ca-certificates
|
||||||
|
===================================================================
|
||||||
|
--- git.orig/sbin/update-ca-certificates
|
||||||
|
+++ git/sbin/update-ca-certificates
|
||||||
|
@@ -191,9 +191,7 @@ if [ -d "$HOOKSDIR" ]
|
||||||
|
then
|
||||||
|
|
||||||
|
echo "Running hooks in $HOOKSDIR..."
|
||||||
|
- VERBOSE_ARG=
|
||||||
|
- [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose"
|
||||||
|
- eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read hook
|
||||||
|
+ eval run-parts --test "$HOOKSDIR" | while read hook
|
||||||
|
do
|
||||||
|
( cat "$ADDED"
|
||||||
|
cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?."
|
|
@ -1,45 +0,0 @@
|
||||||
From 111e905fe931da1a3800accfc675cc01c8ee080c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ulf Samuelsson <ulf@emagii.com>
|
|
||||||
Date: Tue, 28 Feb 2012 06:42:58 +0100
|
|
||||||
Subject: [PATCH] update-ca-certificates: remove c rehash
|
|
||||||
|
|
||||||
Updated earlier patch to apply clean on 2012-02-12
|
|
||||||
Signed-off-by: Ulf Samuelsson <ulf@emagii.com>
|
|
||||||
---
|
|
||||||
sbin/update-ca-certificates | 20 ++++++++++----------
|
|
||||||
1 files changed, 10 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
|
|
||||||
index 5375950..c567e3d 100755
|
|
||||||
--- a/sbin/update-ca-certificates
|
|
||||||
+++ b/sbin/update-ca-certificates
|
|
||||||
@@ -132,16 +132,16 @@ rm -f "$CERTBUNDLE"
|
|
||||||
ADDED_CNT=$(wc -l < "$ADDED")
|
|
||||||
REMOVED_CNT=$(wc -l < "$REMOVED")
|
|
||||||
|
|
||||||
-if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ]
|
|
||||||
-then
|
|
||||||
- # only run if set of files has changed
|
|
||||||
- if [ "$verbose" = 0 ]
|
|
||||||
- then
|
|
||||||
- c_rehash . > /dev/null
|
|
||||||
- else
|
|
||||||
- c_rehash .
|
|
||||||
- fi
|
|
||||||
-fi
|
|
||||||
+#if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ]
|
|
||||||
+#then
|
|
||||||
+# # only run if set of files has changed
|
|
||||||
+# if [ "$verbose" = 0 ]
|
|
||||||
+# then
|
|
||||||
+# c_rehash . > /dev/null
|
|
||||||
+# else
|
|
||||||
+# c_rehash .
|
|
||||||
+# fi
|
|
||||||
+#fi
|
|
||||||
|
|
||||||
chmod 0644 "$TEMPBUNDLE"
|
|
||||||
mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
|
|
||||||
--
|
|
||||||
1.7.4.1
|
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
From 724cb153ca0f607fb38b3a8db3ebb2742601cd81 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andreas Oberritter <obi@opendreambox.org>
|
||||||
|
Date: Tue, 19 Mar 2013 17:14:33 +0100
|
||||||
|
Subject: [PATCH 2/2] update-ca-certificates: use $SYSROOT
|
||||||
|
|
||||||
|
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
|
||||||
|
---
|
||||||
|
sbin/update-ca-certificates | 14 +++++++-------
|
||||||
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
Index: git/sbin/update-ca-certificates
|
||||||
|
===================================================================
|
||||||
|
--- git.orig/sbin/update-ca-certificates
|
||||||
|
+++ git/sbin/update-ca-certificates
|
||||||
|
@@ -24,12 +24,12 @@
|
||||||
|
verbose=0
|
||||||
|
fresh=0
|
||||||
|
default=0
|
||||||
|
-CERTSCONF=/etc/ca-certificates.conf
|
||||||
|
-CERTSDIR=/usr/share/ca-certificates
|
||||||
|
-LOCALCERTSDIR=/usr/local/share/ca-certificates
|
||||||
|
+CERTSCONF=$SYSROOT/etc/ca-certificates.conf
|
||||||
|
+CERTSDIR=$SYSROOT/usr/share/ca-certificates
|
||||||
|
+LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates
|
||||||
|
CERTBUNDLE=ca-certificates.crt
|
||||||
|
-ETCCERTSDIR=/etc/ssl/certs
|
||||||
|
-HOOKSDIR=/etc/ca-certificates/update.d
|
||||||
|
+ETCCERTSDIR=$SYSROOT/etc/ssl/certs
|
||||||
|
+HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d
|
||||||
|
|
||||||
|
while [ $# -gt 0 ];
|
||||||
|
do
|
||||||
|
@@ -92,9 +92,9 @@ add() {
|
||||||
|
PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
|
||||||
|
-e 's/[()]/=/g' \
|
||||||
|
-e 's/,/_/g').pem"
|
||||||
|
- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
|
||||||
|
+ if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${CERT##$SYSROOT}" ]
|
||||||
|
then
|
||||||
|
- ln -sf "$CERT" "$PEM"
|
||||||
|
+ ln -sf "${CERT##$SYSROOT}" "$PEM"
|
||||||
|
echo "+$PEM" >> "$ADDED"
|
||||||
|
fi
|
||||||
|
# Add trailing newline to certificate, if it is missing (#635570)
|
|
@ -0,0 +1,71 @@
|
||||||
|
From a9fc13b2aee55655d58fcb77a3180fa99f96438a Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
|
||||||
|
Date: Wed, 28 Mar 2018 16:45:05 +0100
|
||||||
|
Subject: [PATCH] update-ca-certificates: use relative symlinks from
|
||||||
|
$ETCCERTSDIR
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
update-ca-certificates symlinks (trusted) certificates
|
||||||
|
from $CERTSDIR or $LOCALCERTSDIR into $ETCCERTSDIR.
|
||||||
|
update-ca-certificates can call hook scripts installed
|
||||||
|
into /etc/ca-certificates/update.d. Those scripts are
|
||||||
|
passed the pem file in /etc/ssl/certs/ that was added or
|
||||||
|
removed in this run and those pem files are absolute
|
||||||
|
symlinks into $CERTSDIR or $LOCALCERTSDIR at the moment.
|
||||||
|
|
||||||
|
When running update-ca-certificates during image build
|
||||||
|
time, they thusly all point into the host's file system,
|
||||||
|
not into the $SYSROOT. This means:
|
||||||
|
* the host's file system layout must match the one
|
||||||
|
produced by OE, and
|
||||||
|
* it also means that the host must have installed the same
|
||||||
|
(or more) certificates as the target in $CERTSDIR and
|
||||||
|
$LOCALCERTSDIR
|
||||||
|
|
||||||
|
This is a problem when wanting to execute hook scripts,
|
||||||
|
because they all need to be taught about $SYSROOT, and
|
||||||
|
behave differently depending on whether they're called
|
||||||
|
at image build time, or on the target, as otherwise they
|
||||||
|
will be trying to actually read the host's certificates
|
||||||
|
from $CERTSDIR or $LOCALCERTSDIR.
|
||||||
|
|
||||||
|
This also is a problem when running anything else during
|
||||||
|
image build time that depends on the trusted CA
|
||||||
|
certificates.
|
||||||
|
|
||||||
|
Changing the symlink to be relative solves all of these
|
||||||
|
problems. Do so.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [OE-specific]
|
||||||
|
Signed-off-by: André Draszik <andre.draszik@jci.com>
|
||||||
|
---
|
||||||
|
sbin/update-ca-certificates | 6 ++++--
|
||||||
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
|
||||||
|
index 00f80c7..7e911a9 100755
|
||||||
|
--- a/sbin/update-ca-certificates
|
||||||
|
+++ b/sbin/update-ca-certificates
|
||||||
|
@@ -29,6 +29,7 @@ CERTSDIR=$SYSROOT/usr/share/ca-certificates
|
||||||
|
LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates
|
||||||
|
CERTBUNDLE=ca-certificates.crt
|
||||||
|
ETCCERTSDIR=$SYSROOT/etc/ssl/certs
|
||||||
|
+FSROOT=../../../ # to get from $ETCCERTSDIR to the root of the file system
|
||||||
|
HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d
|
||||||
|
|
||||||
|
while [ $# -gt 0 ];
|
||||||
|
@@ -125,9 +126,10 @@ add() {
|
||||||
|
PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
|
||||||
|
-e 's/[()]/=/g' \
|
||||||
|
-e 's/,/_/g').pem"
|
||||||
|
- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${CERT##$SYSROOT}" ]
|
||||||
|
+ DST="$(echo ${CERT} | sed -e "s|^$SYSROOT||" -e "s|^/|$FSROOT|" )"
|
||||||
|
+ if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${DST}" ]
|
||||||
|
then
|
||||||
|
- ln -sf "${CERT##$SYSROOT}" "$PEM"
|
||||||
|
+ ln -sf "${DST}" "$PEM"
|
||||||
|
echo "+$PEM" >> "$ADDED"
|
||||||
|
fi
|
||||||
|
# Add trailing newline to certificate, if it is missing (#635570)
|
|
@ -0,0 +1,45 @@
|
||||||
|
From c32d2e7154e242402f086b126dc439507813f173 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oliver Smith <osmith@sysmocom.de>
|
||||||
|
Date: Tue, 16 Nov 2021 08:38:47 +0100
|
||||||
|
Subject: [PATCH] Revert "update-ca-certificates: Replace deprecated mktemp -t
|
||||||
|
with mktemp --tmpdir"
|
||||||
|
|
||||||
|
This reverts commit 66951d3b45ffe24d182d36ec02d3ec7aee30ece7.
|
||||||
|
|
||||||
|
The busybox version we use doesn't support --tmpdir. Fix for:
|
||||||
|
|
||||||
|
root@sysmocom-alix:~# opkg upgrade
|
||||||
|
Not selecting udev 232 as installing it would break existing dependencies.
|
||||||
|
Configuring ca-certificates.
|
||||||
|
mktemp: unrecognized option '--tmpdir'
|
||||||
|
BusyBox v1.24.1 (2019-08-13 07:53:38 UTC) multi-call binary.
|
||||||
|
|
||||||
|
Usage: mktemp [-dt] [-p DIR] [TEMPLATE]
|
||||||
|
Collected errors:
|
||||||
|
* pkg_run_script: package "ca-certificates" postinst script returned status 1.
|
||||||
|
* opkg_configure: ca-certificates.postinst returned 1.
|
||||||
|
root@sysmocom-alix:~#
|
||||||
|
|
||||||
|
Related: SYS#5283
|
||||||
|
---
|
||||||
|
sbin/update-ca-certificates | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
|
||||||
|
index 9a876d7..40a3932 100755
|
||||||
|
--- a/sbin/update-ca-certificates
|
||||||
|
+++ b/sbin/update-ca-certificates
|
||||||
|
@@ -81,8 +81,8 @@ trap cleanup 0
|
||||||
|
# Helper files. (Some of them are not simple arrays because we spawn
|
||||||
|
# subshells later on.)
|
||||||
|
TEMPBUNDLE="${ETCCERTSDIR}/${CERTBUNDLE}.new"
|
||||||
|
-ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
|
||||||
|
-REMOVED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
|
||||||
|
+ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
|
||||||
|
+REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
|
||||||
|
|
||||||
|
# Adds a certificate to the list of trusted ones. This includes a symlink
|
||||||
|
# in /etc/ssl/certs to the certificate file and its inclusion into the
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
update-ca-certificates: find SYSROOT relative to its own location
|
||||||
|
|
||||||
|
This makes the script relocatable.
|
||||||
|
|
||||||
|
Index: git/sbin/update-ca-certificates
|
||||||
|
===================================================================
|
||||||
|
--- git.orig/sbin/update-ca-certificates
|
||||||
|
+++ git/sbin/update-ca-certificates
|
||||||
|
@@ -66,6 +66,39 @@ do
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
+if [ -z "$SYSROOT" ]; then
|
||||||
|
+ local_which () {
|
||||||
|
+ if [ $# -lt 1 ]; then
|
||||||
|
+ return 1
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ (
|
||||||
|
+ IFS=:
|
||||||
|
+ for entry in $PATH; do
|
||||||
|
+ if [ -x "$entry/$1" ]; then
|
||||||
|
+ echo "$entry/$1"
|
||||||
|
+ exit 0
|
||||||
|
+ fi
|
||||||
|
+ done
|
||||||
|
+ exit 1
|
||||||
|
+ )
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ case "$0" in
|
||||||
|
+ */*)
|
||||||
|
+ sbindir=$(cd ${0%/*} && pwd)
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ sbindir=$(cd $(dirname $(local_which $0)) && pwd)
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ prefix=${sbindir%/*}
|
||||||
|
+ SYSROOT=${prefix%/*}
|
||||||
|
+ if [ ! -d "$SYSROOT/usr/share/ca-certificates" ]; then
|
||||||
|
+ SYSROOT=
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
if [ ! -s "$CERTSCONF" ]
|
||||||
|
then
|
||||||
|
fresh=1
|
|
@ -1,46 +0,0 @@
|
||||||
DESCRIPTION = "Common CA certificates"
|
|
||||||
HOMEPAGE = "http://packages.debian.org/sid/ca-certificates"
|
|
||||||
SECTION = "misc"
|
|
||||||
LICENSE = "GPLv2+"
|
|
||||||
LIC_FILES_CHKSUM = "file://debian/copyright;md5=6135800ff6d893c7904d7aad90972eb5"
|
|
||||||
|
|
||||||
SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/ca-certificates_${PV}.tar.gz \
|
|
||||||
file://0001-update-ca-certificates-remove-c-rehash.patch"
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "5105d4cc086f0d4ecf7bf2e4c4667289"
|
|
||||||
SRC_URI[sha256sum] = "878cd1130ba056fe5f96decde7e5fc1b71d35eb8565a1515744912e100731ee9"
|
|
||||||
|
|
||||||
inherit allarch
|
|
||||||
|
|
||||||
do_install_prepend() {
|
|
||||||
mkdir -p ${D}/usr/share/ca-certificates
|
|
||||||
mkdir -p ${D}/usr/sbin
|
|
||||||
mkdir -p ${D}/etc/ssl/certs
|
|
||||||
mkdir -p ${D}/etc/ca-certificates/update.d
|
|
||||||
|
|
||||||
oe_runmake 'DESTDIR=${D}' install
|
|
||||||
}
|
|
||||||
|
|
||||||
do_install_append() {
|
|
||||||
cd ${D}/usr/share/ca-certificates
|
|
||||||
echo "# Lines starting with # will be ignored" > ${D}/etc/ca-certificates.conf
|
|
||||||
echo "# Lines starting with ! will remove certificate on next update" >> ${D}/etc/ca-certificates.conf
|
|
||||||
echo "#" >> ${D}/etc/ca-certificates.conf
|
|
||||||
for crt in $(find . -type f -name '*.crt' -print)
|
|
||||||
do
|
|
||||||
crt=$(echo $crt | sed -e 's/\.\///')
|
|
||||||
echo $crt >> ${D}/etc/ca-certificates.conf
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst_${PN} () {
|
|
||||||
if [ -n "$D" ] ; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
${sbindir}/update-ca-certificates
|
|
||||||
}
|
|
||||||
|
|
||||||
CONFFILES_${PN} = "/etc/ca-certificates.conf"
|
|
||||||
|
|
||||||
DEFAULT_PREFERENCE = "-1"
|
|
|
@ -0,0 +1,92 @@
|
||||||
|
SUMMARY = "Common CA certificates"
|
||||||
|
DESCRIPTION = "This package includes PEM files of CA certificates to allow \
|
||||||
|
SSL-based applications to check for the authenticity of SSL connections. \
|
||||||
|
This derived from Debian's CA Certificates."
|
||||||
|
HOMEPAGE = "http://packages.debian.org/sid/ca-certificates"
|
||||||
|
SECTION = "misc"
|
||||||
|
LICENSE = "GPL-2.0+ & MPL-2.0"
|
||||||
|
LIC_FILES_CHKSUM = "file://debian/copyright;md5=ae5b36b514e3f12ce1aa8e2ee67f3d7e"
|
||||||
|
PR="r1"
|
||||||
|
|
||||||
|
# This is needed to ensure we can run the postinst at image creation time
|
||||||
|
DEPENDS = ""
|
||||||
|
DEPENDS_class-native = "openssl-native"
|
||||||
|
DEPENDS_class-nativesdk = "openssl-native"
|
||||||
|
# Need rehash from openssl and run-parts from debianutils
|
||||||
|
PACKAGE_WRITE_DEPS += "openssl-native debianutils-native"
|
||||||
|
|
||||||
|
SRCREV = "07de54fdcc5806bde549e1edf60738c6bccf50e8"
|
||||||
|
|
||||||
|
SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \
|
||||||
|
file://0002-update-ca-certificates-use-SYSROOT.patch \
|
||||||
|
file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \
|
||||||
|
file://default-sysroot.patch \
|
||||||
|
file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \
|
||||||
|
file://0001-Revert-mozilla-certdata2pem.py-print-a-warning-for-e.patch \
|
||||||
|
file://0004-Revert-update-ca-certificates-Replace-deprecated-mkt.patch \
|
||||||
|
"
|
||||||
|
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+)"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
inherit allarch
|
||||||
|
|
||||||
|
EXTRA_OEMAKE = "\
|
||||||
|
'CERTSDIR=${datadir}/ca-certificates' \
|
||||||
|
'SBINDIR=${sbindir}' \
|
||||||
|
"
|
||||||
|
|
||||||
|
do_compile_prepend() {
|
||||||
|
oe_runmake clean
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install () {
|
||||||
|
install -d ${D}${datadir}/ca-certificates \
|
||||||
|
${D}${sysconfdir}/ssl/certs \
|
||||||
|
${D}${sysconfdir}/ca-certificates/update.d
|
||||||
|
oe_runmake 'DESTDIR=${D}' install
|
||||||
|
|
||||||
|
install -d ${D}${mandir}/man8
|
||||||
|
install -m 0644 sbin/update-ca-certificates.8 ${D}${mandir}/man8/
|
||||||
|
|
||||||
|
install -d ${D}${sysconfdir}
|
||||||
|
{
|
||||||
|
echo "# Lines starting with # will be ignored"
|
||||||
|
echo "# Lines starting with ! will remove certificate on next update"
|
||||||
|
echo "#"
|
||||||
|
find ${D}${datadir}/ca-certificates -type f -name '*.crt' | \
|
||||||
|
sed 's,^${D}${datadir}/ca-certificates/,,' | sort
|
||||||
|
} >${D}${sysconfdir}/ca-certificates.conf
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install_append_class-target () {
|
||||||
|
sed -i -e 's,/etc/,${sysconfdir}/,' \
|
||||||
|
-e 's,/usr/share/,${datadir}/,' \
|
||||||
|
-e 's,/usr/local,${prefix}/local,' \
|
||||||
|
${D}${sbindir}/update-ca-certificates \
|
||||||
|
${D}${mandir}/man8/update-ca-certificates.8
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst_${PN}_class-target () {
|
||||||
|
SYSROOT="$D" $D${sbindir}/update-ca-certificates
|
||||||
|
}
|
||||||
|
|
||||||
|
CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf"
|
||||||
|
|
||||||
|
# Rather than make a postinst script that works for both target and nativesdk,
|
||||||
|
# we just run update-ca-certificate from do_install() for nativesdk.
|
||||||
|
CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt"
|
||||||
|
do_install_append_class-nativesdk () {
|
||||||
|
SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install_append_class-native () {
|
||||||
|
SYSROOT="${D}${base_prefix}" ${D}${sbindir}/update-ca-certificates
|
||||||
|
}
|
||||||
|
|
||||||
|
RDEPENDS_${PN} += "openssl"
|
||||||
|
#RDEPENDS_${PN}_append_class-target = " openssl-bin openssl"
|
||||||
|
#RDEPENDS_${PN}_append_class-native = " openssl-native"
|
||||||
|
#RDEPENDS_${PN}_append_class-nativesdk = " nativesdk-openssl-bin nativesdk-openssl"
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "native nativesdk"
|
|
@ -1,20 +0,0 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
|
|
||||||
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
|
|
||||||
DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
|
|
||||||
PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
|
|
||||||
Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
|
|
||||||
AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
|
|
||||||
rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
|
|
||||||
OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
|
|
||||||
xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
|
|
||||||
7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
|
|
||||||
aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
|
|
||||||
HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
|
|
||||||
SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
|
|
||||||
ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
|
|
||||||
AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
|
|
||||||
R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
|
|
||||||
JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
|
|
||||||
Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
|
|
||||||
-----END CERTIFICATE-----
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
|
||||||
|
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
|
||||||
|
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
|
||||||
|
WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
|
||||||
|
ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
|
||||||
|
MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
|
||||||
|
h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
|
||||||
|
0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
|
||||||
|
A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
|
||||||
|
T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
|
||||||
|
B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
|
||||||
|
B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
|
||||||
|
KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
|
||||||
|
OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
|
||||||
|
jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
|
||||||
|
qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
|
||||||
|
rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
|
||||||
|
HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
|
||||||
|
hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
|
||||||
|
ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
|
||||||
|
3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
|
||||||
|
NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
|
||||||
|
ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
|
||||||
|
TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
|
||||||
|
jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
|
||||||
|
oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
|
||||||
|
4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
|
||||||
|
mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
|
||||||
|
emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
|
||||||
|
-----END CERTIFICATE-----
|
|
@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||||
PR = "r1"
|
PR = "r1"
|
||||||
|
|
||||||
SRCREV = "ec983ad90408b689408c2c89179bf8f7b35665a6"
|
SRCREV = "ec983ad90408b689408c2c89179bf8f7b35665a6"
|
||||||
SRC_URI = "git://git.samba.org/cifs-utils.git"
|
SRC_URI = "git://git.samba.org/cifs-utils.git;protocol=https"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
|
|
@ -1,46 +0,0 @@
|
||||||
From ca1a781afbd68697ef2f573557f1f93ec7ab8d3c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
|
||||||
Date: Sun, 29 Apr 2012 00:05:59 +0200
|
|
||||||
Subject: [PATCH] SConstruct: disable html and man docs building because
|
|
||||||
xmlto-native from OE is broken
|
|
||||||
|
|
||||||
It will try to load dtd and fail:
|
|
||||||
| xmlto man gpsctl.xml; mv `basename gpsctl.1` gpsctl.1
|
|
||||||
| xmlto: /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate (status 3)
|
|
||||||
| xmlto: Fix document syntax or use --skip-validation option
|
|
||||||
| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
|
|
||||||
| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml:8: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
|
|
||||||
| "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
|
|
||||||
| ^
|
|
||||||
| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
|
|
||||||
| warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
|
|
||||||
| validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
|
|
||||||
| Document /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate
|
|
||||||
| mv: cannot stat `gpsctl.1': No such file or directory
|
|
||||||
| scons: *** [gpsctl.1] Error 1
|
|
||||||
| scons: building terminated because of errors.
|
|
||||||
|
|
||||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
||||||
---
|
|
||||||
SConstruct | 4 ++--
|
|
||||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
Index: gpsd-3.10/SConstruct
|
|
||||||
===================================================================
|
|
||||||
--- gpsd-3.10.orig/SConstruct
|
|
||||||
+++ gpsd-3.10/SConstruct
|
|
||||||
@@ -704,12 +704,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in
|
|
||||||
|
|
||||||
manbuilder = mangenerator = htmlbuilder = None
|
|
||||||
if env['manbuild']:
|
|
||||||
- if config.CheckXsltproc():
|
|
||||||
+ if False and config.CheckXsltproc():
|
|
||||||
mangenerator = 'xsltproc'
|
|
||||||
build = "xsltproc --nonet %s $SOURCE >$TARGET"
|
|
||||||
htmlbuilder = build % docbook_html_uri
|
|
||||||
manbuilder = build % docbook_man_uri
|
|
||||||
- elif WhereIs("xmlto"):
|
|
||||||
+ elif False and WhereIs("xmlto"):
|
|
||||||
mangenerator = 'xmlto'
|
|
||||||
xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` `dirname $TARGET`"
|
|
||||||
htmlbuilder = xmlto % "html-nochunks"
|
|
|
@ -1,72 +0,0 @@
|
||||||
From dd3ca38b27cce93f7e932abaa27b41371234fa90 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
|
||||||
Date: Tue, 24 Apr 2012 18:45:14 +0200
|
|
||||||
Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot
|
|
||||||
from python_lib_dir
|
|
||||||
|
|
||||||
* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix
|
|
||||||
and with PYTHONPATH from OE it's pointing to native python dir
|
|
||||||
|
|
||||||
$ export PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/
|
|
||||||
$ python
|
|
||||||
Python 2.7.2 (default, Apr 18 2012, 09:19:59)
|
|
||||||
[GCC 4.6.2] on linux2
|
|
||||||
Type "help", "copyright", "credits" or "license" for more information.
|
|
||||||
>>> from distutils import sysconfig
|
|
||||||
>>> sysconfig.get_config_vars('INCLUDEPY')
|
|
||||||
['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
|
|
||||||
>>>
|
|
||||||
$ unset PYTHONPATH
|
|
||||||
$ python
|
|
||||||
Python 2.7.2 (default, Apr 18 2012, 09:19:59)
|
|
||||||
[GCC 4.6.2] on linux2
|
|
||||||
Type "help", "copyright", "credits" or "license" for more information.
|
|
||||||
>>> from distutils import sysconfig
|
|
||||||
>>> sysconfig.get_config_vars('INCLUDEPY')
|
|
||||||
['/python2.7']
|
|
||||||
>>> import sysconfig
|
|
||||||
>>> sysconfig.get_config_vars('INCLUDEPY')
|
|
||||||
['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
|
|
||||||
* python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
|
|
||||||
returns path to target sysroot
|
|
||||||
|
|
||||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
||||||
---
|
|
||||||
SConstruct | 9 +++++++++
|
|
||||||
1 files changed, 9 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/SConstruct b/SConstruct
|
|
||||||
index 3c919fc..8478181 100644
|
|
||||||
--- a/SConstruct
|
|
||||||
+++ b/SConstruct
|
|
||||||
@@ -932,6 +932,12 @@ else:
|
|
||||||
if vars[i] is None:
|
|
||||||
vars[i] = []
|
|
||||||
(cc, cxx, opt, basecflags, ccshared, ldshared, so_ext, includepy, ldflags) = vars
|
|
||||||
+
|
|
||||||
+ if env['sysroot']:
|
|
||||||
+ print "Prefixing includepy '%s' with sysroot prefix" % includepy
|
|
||||||
+ includepy = os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], includepy))
|
|
||||||
+ print "'%s'" % includepy
|
|
||||||
+
|
|
||||||
# in case CC/CXX was set to the scan-build wrapper,
|
|
||||||
# ensure that we build the python modules with scan-build, too
|
|
||||||
if env['CC'] is None or env['CC'].find('scan-build') < 0:
|
|
||||||
@@ -1165,11 +1171,14 @@ if not env['python']:
|
|
||||||
python_install = []
|
|
||||||
else:
|
|
||||||
python_lib_dir = sysconfig.get_python_lib(plat_specific=1)
|
|
||||||
+ python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
|
|
||||||
python_module_dir = python_lib_dir + os.sep + 'gps'
|
|
||||||
python_extensions_install = python_env.Install( DESTDIR + python_module_dir,
|
|
||||||
python_built_extensions)
|
|
||||||
if not env['debug'] and not env['profiling'] and env['strip']:
|
|
||||||
python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET')
|
|
||||||
+ env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \
|
|
||||||
+ % (python_lib_dir, ))
|
|
||||||
|
|
||||||
python_modules_install = python_env.Install( DESTDIR + python_module_dir,
|
|
||||||
python_modules)
|
|
||||||
--
|
|
||||||
1.7.8.5
|
|
||||||
|
|
|
@ -1,140 +0,0 @@
|
||||||
From 19a55075d4e60e07d03d49937cd2a4d9239d00a4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Holger Hans Peter Freyther <hfreyther@sysmocom.de>
|
|
||||||
Date: Fri, 22 Aug 2014 09:55:19 +0200
|
|
||||||
Subject: [PATCH] gps2udp: Add a label, timestamp and mac address to each
|
|
||||||
report
|
|
||||||
|
|
||||||
---
|
|
||||||
gps2udp.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
|
|
||||||
1 file changed, 60 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/gps2udp.c b/gps2udp.c
|
|
||||||
index 313ef36..e1bed05 100644
|
|
||||||
--- a/gps2udp.c
|
|
||||||
+++ b/gps2udp.c
|
|
||||||
@@ -38,6 +38,8 @@
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <netdb.h>
|
|
||||||
+#include <net/if.h>
|
|
||||||
+#include <sys/ioctl.h>
|
|
||||||
#endif /* S_SPLINT_S */
|
|
||||||
|
|
||||||
#define MAX_TIME_LEN 80
|
|
||||||
@@ -56,6 +58,9 @@ static struct fixsource_t gpsd_source;
|
|
||||||
static unsigned int flags;
|
|
||||||
static int debug = 0;
|
|
||||||
static bool aisonly = false;
|
|
||||||
+static const char *label;
|
|
||||||
+static const char *mac;
|
|
||||||
+static char *mac_string;
|
|
||||||
|
|
||||||
/*@-statictrans@*/
|
|
||||||
/*@observer@*/static char* time2string(void)
|
|
||||||
@@ -80,6 +85,7 @@ static bool aisonly = false;
|
|
||||||
|
|
||||||
static int send_udp (char *nmeastring, size_t ind)
|
|
||||||
{
|
|
||||||
+ char output[1024];
|
|
||||||
char message[255];
|
|
||||||
char *buffer;
|
|
||||||
int channel;
|
|
||||||
@@ -105,12 +111,23 @@ static int send_udp (char *nmeastring, size_t ind)
|
|
||||||
buffer[ind] = '\r'; ind++;
|
|
||||||
buffer[ind] = '\0';
|
|
||||||
|
|
||||||
+ /* copy once more for the label */
|
|
||||||
+ if (label)
|
|
||||||
+ snprintf(output, 1024, "%s,%llu,%s,%s",
|
|
||||||
+ label, (unsigned long long ) time(NULL), mac_string, buffer);
|
|
||||||
+ else
|
|
||||||
+ snprintf(output, 1024, "%s", buffer);
|
|
||||||
+
|
|
||||||
+ output[1023] = '\0';
|
|
||||||
+ ind = strlen(output);
|
|
||||||
+
|
|
||||||
+
|
|
||||||
/* send message on udp channel */
|
|
||||||
/*@-type@*/
|
|
||||||
for (channel=0; channel < udpchannel; channel ++) {
|
|
||||||
ssize_t status;
|
|
||||||
status = sendto(sock[channel],
|
|
||||||
- buffer,
|
|
||||||
+ output,
|
|
||||||
ind,
|
|
||||||
0,
|
|
||||||
&remote[channel],
|
|
||||||
@@ -182,6 +199,8 @@ static void usage(void)
|
|
||||||
"-c [count] exit after count packets.\n"
|
|
||||||
"-b Run in background as a daemon.\n"
|
|
||||||
"-d [0-2] 1 display sent packets, 2 ignored packets.\n"
|
|
||||||
+ "-l [NAME] A label to be used for the output\n"
|
|
||||||
+ "-m [IF_NAME] The interface to extract the mac from\n"
|
|
||||||
"-v Print version and exit.\n\n"
|
|
||||||
"You must specify one, or more, of -r, -R, or -w\n"
|
|
||||||
);
|
|
||||||
@@ -356,7 +375,7 @@ int main(int argc, char **argv)
|
|
||||||
char *udphostport[MAX_UDP_DEST];
|
|
||||||
|
|
||||||
flags = WATCH_ENABLE;
|
|
||||||
- while ((option = getopt(argc, argv, "?habnjcvl:u:d:")) != -1)
|
|
||||||
+ while ((option = getopt(argc, argv, "?habnjcvl:u:d:l:m:")) != -1)
|
|
||||||
{
|
|
||||||
switch (option) {
|
|
||||||
case 'd':
|
|
||||||
@@ -390,6 +409,12 @@ int main(int argc, char **argv)
|
|
||||||
udphostport[udpchannel++] = optarg;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
+ case 'l':
|
|
||||||
+ label = optarg;
|
|
||||||
+ break;
|
|
||||||
+ case 'm':
|
|
||||||
+ mac = optarg;
|
|
||||||
+ break;
|
|
||||||
case 'v':
|
|
||||||
(void)fprintf(stderr, "%s: %s (revision %s)\n",
|
|
||||||
argv[0], VERSION, REVISION);
|
|
||||||
@@ -402,6 +427,39 @@ int main(int argc, char **argv)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (label && !mac) {
|
|
||||||
+ fprintf(stderr, "Need to specify the ethernet device to find the mac.\n");
|
|
||||||
+ exit(EXIT_FAILURE);
|
|
||||||
+ }
|
|
||||||
+ if (mac && strlen(mac) >= IFNAMSIZ) {
|
|
||||||
+ fprintf(stderr, "Interface name is too long.\n");
|
|
||||||
+ exit(EXIT_FAILURE);
|
|
||||||
+ } else if (mac) {
|
|
||||||
+ struct ifreq addr = { };
|
|
||||||
+ int fd, rc;
|
|
||||||
+ fd = socket(AF_INET, SOCK_DGRAM, 0);
|
|
||||||
+ if (fd < 0) {
|
|
||||||
+ fprintf(stderr, "Failed to open socket.\n");
|
|
||||||
+ exit(EXIT_FAILURE);
|
|
||||||
+ }
|
|
||||||
+ memcpy(&addr.ifr_name, mac, strlen(mac));
|
|
||||||
+ rc = ioctl(fd, SIOCGIFHWADDR, &addr);
|
|
||||||
+ close(fd);
|
|
||||||
+ if (rc < 0) {
|
|
||||||
+ fprintf(stderr, "Failed to query address.\n");
|
|
||||||
+ exit(EXIT_FAILURE);
|
|
||||||
+ }
|
|
||||||
+ mac_string = malloc(40 * sizeof(char));
|
|
||||||
+ snprintf(mac_string, 40,
|
|
||||||
+ "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
|
|
||||||
+ addr.ifr_hwaddr.sa_data[0] & 0xff,
|
|
||||||
+ addr.ifr_hwaddr.sa_data[1] & 0xff,
|
|
||||||
+ addr.ifr_hwaddr.sa_data[2] & 0xff,
|
|
||||||
+ addr.ifr_hwaddr.sa_data[3] & 0xff,
|
|
||||||
+ addr.ifr_hwaddr.sa_data[4] & 0xff,
|
|
||||||
+ addr.ifr_hwaddr.sa_data[5] & 0xff);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* Grok the server, port, and device. */
|
|
||||||
if (optind < argc)
|
|
||||||
gpsd_source_spec(argv[optind], &gpsd_source);
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
From f5f262be8ae54bd0c0f52802f2007ec89163756f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
|
||||||
Date: Tue, 24 Apr 2012 11:52:35 +0200
|
|
||||||
Subject: [PATCH 1/2] SConstruct: respect sysroot also in SPLINTOPTS
|
|
||||||
|
|
||||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
||||||
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
|
|
||||||
---
|
|
||||||
SConstruct | 5 ++++-
|
|
||||||
1 files changed, 4 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
Index: gpsd-3.10/SConstruct
|
|
||||||
===================================================================
|
|
||||||
--- gpsd-3.10.orig/SConstruct
|
|
||||||
+++ gpsd-3.10/SConstruct
|
|
||||||
@@ -1414,7 +1414,10 @@ def Utility(target, source, action):
|
|
||||||
# Report splint warnings
|
|
||||||
# Note: test_bits.c is unsplintable because of the PRI64 macros.
|
|
||||||
# If you get preprocessor or fatal errors, add +showscan.
|
|
||||||
-splintopts = "-I/usr/include/libusb-1.0 +quiet"
|
|
||||||
+if not env['sysroot']:
|
|
||||||
+ splintopts = "-I/usr/include/libusb-1.0 +quiet"
|
|
||||||
+else:
|
|
||||||
+ splintopts = "-I%s/usr/include/libusb-1.0 +quiet" % env['sysroot']
|
|
||||||
# splint does not know about multi-arch, work around that
|
|
||||||
ma_status, ma = _getstatusoutput('dpkg-architecture -qDEB_HOST_MULTIARCH')
|
|
||||||
if ma_status == 0:
|
|
|
@ -1,28 +0,0 @@
|
||||||
Index: gpsd-3.10/driver_tsip.c
|
|
||||||
===================================================================
|
|
||||||
--- gpsd-3.10.orig/driver_tsip.c
|
|
||||||
+++ gpsd-3.10/driver_tsip.c
|
|
||||||
@@ -1201,6 +1201,23 @@ void configuration_packets_generic(struc
|
|
||||||
/* Request Navigation Configuration */
|
|
||||||
putbyte(buf, 0, 0x03);
|
|
||||||
(void)tsip_write(session, 0xbb, buf, 1);
|
|
||||||
+
|
|
||||||
+ gpsd_report(session->context->debug,
|
|
||||||
+ LOG_PROG, "Configuring + Enabling 1PPS\n");
|
|
||||||
+ /* enable 1pps */
|
|
||||||
+ putbyte(buf, 0, 0x4a);
|
|
||||||
+ putbyte(buf, 1, 0x01);
|
|
||||||
+ (void)tsip_write(session, 0x8e, buf, 2);
|
|
||||||
+
|
|
||||||
+ /* request PPS only if at least one sat is visible */
|
|
||||||
+ putbyte(buf, 0, 0x4e);
|
|
||||||
+ putbyte(buf, 1, 0x03);
|
|
||||||
+ (void)tsip_write(session, 0x8e, buf, 2);
|
|
||||||
+
|
|
||||||
+ /* request PPS and TSIP to use UTC time, not GPS */
|
|
||||||
+ putbyte(buf, 0, 0xa2);
|
|
||||||
+ putbyte(buf, 1, 0x03);
|
|
||||||
+ (void)tsip_write(session, 0x8e, buf, 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
void configuration_packets_accutime_gold(struct gps_device_t *session)
|
|
|
@ -1,31 +0,0 @@
|
||||||
Index: gpsd-3.10/gps2udp.c
|
|
||||||
===================================================================
|
|
||||||
--- gpsd-3.10.orig/gps2udp.c
|
|
||||||
+++ gpsd-3.10/gps2udp.c
|
|
||||||
@@ -353,6 +353,7 @@ int main(int argc, char **argv)
|
|
||||||
bool daemonize = false;
|
|
||||||
long count = -1;
|
|
||||||
int option;
|
|
||||||
+ int i;
|
|
||||||
char *udphostport[MAX_UDP_DEST];
|
|
||||||
|
|
||||||
flags = WATCH_ENABLE;
|
|
||||||
@@ -387,7 +388,7 @@ int main(int argc, char **argv)
|
|
||||||
"gps2udp: too many UDP destinations (max=%d)\n",
|
|
||||||
MAX_UDP_DEST);
|
|
||||||
} else {
|
|
||||||
- udphostport[udpchannel++] = optarg;
|
|
||||||
+ udphostport[udpchannel++] = strdup(optarg);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'v':
|
|
||||||
@@ -490,6 +491,9 @@ int main(int argc, char **argv)
|
|
||||||
} // end count
|
|
||||||
} // end len > 3
|
|
||||||
} // end for (;;)
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < udpchannel; ++i)
|
|
||||||
+ free(udphostport[i]);
|
|
||||||
|
|
||||||
// This is an infinite loop, should never be here
|
|
||||||
/*@-unreachable@*/
|
|
|
@ -1,12 +0,0 @@
|
||||||
Index: gpsd-3.9/SConstruct
|
|
||||||
===================================================================
|
|
||||||
--- gpsd-3.9.orig/SConstruct
|
|
||||||
+++ gpsd-3.9/SConstruct
|
|
||||||
@@ -223,6 +223,7 @@ env['PYTHON'] = sys.executable
|
|
||||||
env['STRIP'] = "strip"
|
|
||||||
env['PKG_CONFIG'] = "pkg-config"
|
|
||||||
env['CHRPATH'] = 'chrpath'
|
|
||||||
+env['_RPATH'] = ''
|
|
||||||
for i in ["AR", "ARFLAGS", "CCFLAGS", "CFLAGS", "CC", "CXX", "CXXFLAGS", "STRIP", "PKG_CONFIG", "CHRPATH", "LD", "TAR"]:
|
|
||||||
if os.environ.has_key(i):
|
|
||||||
j = i
|
|
|
@ -0,0 +1,156 @@
|
||||||
|
From cd89f0b340764e73de76f5297217caf61b3d3283 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oliver Smith <osmith@sysmocom.de>
|
||||||
|
Date: Tue, 13 Dec 2022 16:05:00 +0100
|
||||||
|
Subject: [PATCH] gps2udp: Add a label, timestamp and mac address to each
|
||||||
|
report
|
||||||
|
|
||||||
|
Rebase of 0001-gps2udp-Add-a-label-timestamp-and-mac-address-to-eac.patch
|
||||||
|
we have been carrying:
|
||||||
|
|
||||||
|
From 19a55075d4e60e07d03d49937cd2a4d9239d00a4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Holger Hans Peter Freyther <hfreyther@sysmocom.de>
|
||||||
|
Date: Fri, 22 Aug 2014 09:55:19 +0200
|
||||||
|
Subject: [PATCH] gps2udp: Add a label, timestamp and mac address to each
|
||||||
|
report
|
||||||
|
---
|
||||||
|
clients/gps2udp.c | 61 +++++++++++++++++++++++++++++++++++++++++++++--
|
||||||
|
1 file changed, 59 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/clients/gps2udp.c b/clients/gps2udp.c
|
||||||
|
index 2d9c6033d..d27814f24 100644
|
||||||
|
--- a/clients/gps2udp.c
|
||||||
|
+++ b/clients/gps2udp.c
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
#include <getopt.h> // for getopt_long()
|
||||||
|
#endif
|
||||||
|
#include <netdb.h> /* for gethostbyname() */
|
||||||
|
+#include <net/if.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
@@ -29,6 +30,7 @@
|
||||||
|
// do not use strsep() it is not POSIX
|
||||||
|
#include <string.h> /* for strlcpy(), strtok(), etc. */
|
||||||
|
#include <strings.h>
|
||||||
|
+#include <sys/ioctl.h>
|
||||||
|
#include <sys/select.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
@@ -60,6 +62,9 @@ static unsigned int flags;
|
||||||
|
static unsigned int debug = 0;
|
||||||
|
static bool aisonly = false;
|
||||||
|
static bool tpvonly = false;
|
||||||
|
+static const char *label;
|
||||||
|
+static const char *mac;
|
||||||
|
+static char *mac_string;
|
||||||
|
|
||||||
|
// return local time hh:mm:ss
|
||||||
|
static char* time2string(void)
|
||||||
|
@@ -82,6 +87,7 @@ static char* time2string(void)
|
||||||
|
|
||||||
|
static int send_udp(char *nmeastring, size_t ind)
|
||||||
|
{
|
||||||
|
+ char output[1024];
|
||||||
|
char message[MAX_PACKET_LENGTH];
|
||||||
|
char *buffer;
|
||||||
|
int channel;
|
||||||
|
@@ -108,6 +114,16 @@ static int send_udp(char *nmeastring, size_t ind)
|
||||||
|
buffer[ind] = '\n'; ind++;
|
||||||
|
buffer[ind] = '\0';
|
||||||
|
|
||||||
|
+ /* copy once more for the label */
|
||||||
|
+ if (label)
|
||||||
|
+ snprintf(output, 1024, "%s,%llu,%s,%s",
|
||||||
|
+ label, (unsigned long long ) time(NULL), mac_string, buffer);
|
||||||
|
+ else
|
||||||
|
+ snprintf(output, 1024, "%s", buffer);
|
||||||
|
+
|
||||||
|
+ output[1023] = '\0';
|
||||||
|
+ ind = strlen(output);
|
||||||
|
+
|
||||||
|
if (0 == (flags & WATCH_JSON) &&
|
||||||
|
'{' == buffer[0]) {
|
||||||
|
// do not send JSON when not configured to do so
|
||||||
|
@@ -129,7 +145,7 @@ static int send_udp(char *nmeastring, size_t ind)
|
||||||
|
// send message on udp channel
|
||||||
|
for (channel=0; channel < udpchannel; channel ++) {
|
||||||
|
ssize_t status = sendto(sock[channel],
|
||||||
|
- buffer,
|
||||||
|
+ output,
|
||||||
|
ind,
|
||||||
|
0,
|
||||||
|
(struct sockaddr *)&remote[channel],
|
||||||
|
@@ -225,6 +241,8 @@ static void usage(void)
|
||||||
|
" -c COUNT Exit after count packets.\n"
|
||||||
|
" -d [0-2] 1 display sent packets, "
|
||||||
|
"2 display ignored packets.\n"
|
||||||
|
+ " -l [NAME] A label to be used for the output\n"
|
||||||
|
+ " -m [IF_NAME] The interface to extract the mac from\n"
|
||||||
|
" -h Show this help.\n"
|
||||||
|
" -j Feed JSON.\n"
|
||||||
|
" -n Feed NMEA.\n"
|
||||||
|
@@ -421,7 +439,7 @@ int main(int argc, char **argv)
|
||||||
|
bool daemonize = false;
|
||||||
|
long count = -1;
|
||||||
|
char *udphostport[MAX_UDP_DEST];
|
||||||
|
- const char *optstring = "?abc:d:hjntu:V";
|
||||||
|
+ const char *optstring = "?abc:d:l:m:hjntu:V";
|
||||||
|
#ifdef HAVE_GETOPT_LONG
|
||||||
|
int option_index = 0;
|
||||||
|
static struct option long_options[] = {
|
||||||
|
@@ -478,6 +496,12 @@ int main(int argc, char **argv)
|
||||||
|
if (0 < debug)
|
||||||
|
(void)fprintf(stdout, "Debug %u selected\n", debug);
|
||||||
|
break;
|
||||||
|
+ case 'l':
|
||||||
|
+ label = optarg;
|
||||||
|
+ break;
|
||||||
|
+ case 'm':
|
||||||
|
+ mac = optarg;
|
||||||
|
+ break;
|
||||||
|
case 'j':
|
||||||
|
if (0 < debug)
|
||||||
|
(void)fprintf(stdout, "JSON selected\n");
|
||||||
|
@@ -520,6 +544,39 @@ int main(int argc, char **argv)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (label && !mac) {
|
||||||
|
+ fprintf(stderr, "Need to specify the ethernet device to find the mac.\n");
|
||||||
|
+ exit(EXIT_FAILURE);
|
||||||
|
+ }
|
||||||
|
+ if (mac && strlen(mac) >= IFNAMSIZ) {
|
||||||
|
+ fprintf(stderr, "Interface name is too long.\n");
|
||||||
|
+ exit(EXIT_FAILURE);
|
||||||
|
+ } else if (mac) {
|
||||||
|
+ struct ifreq addr = { };
|
||||||
|
+ int fd, rc;
|
||||||
|
+ fd = socket(AF_INET, SOCK_DGRAM, 0);
|
||||||
|
+ if (fd < 0) {
|
||||||
|
+ fprintf(stderr, "Failed to open socket.\n");
|
||||||
|
+ exit(EXIT_FAILURE);
|
||||||
|
+ }
|
||||||
|
+ memcpy(&addr.ifr_name, mac, strlen(mac));
|
||||||
|
+ rc = ioctl(fd, SIOCGIFHWADDR, &addr);
|
||||||
|
+ close(fd);
|
||||||
|
+ if (rc < 0) {
|
||||||
|
+ fprintf(stderr, "Failed to query address.\n");
|
||||||
|
+ exit(EXIT_FAILURE);
|
||||||
|
+ }
|
||||||
|
+ mac_string = malloc(40 * sizeof(char));
|
||||||
|
+ snprintf(mac_string, 40,
|
||||||
|
+ "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
|
||||||
|
+ addr.ifr_hwaddr.sa_data[0] & 0xff,
|
||||||
|
+ addr.ifr_hwaddr.sa_data[1] & 0xff,
|
||||||
|
+ addr.ifr_hwaddr.sa_data[2] & 0xff,
|
||||||
|
+ addr.ifr_hwaddr.sa_data[3] & 0xff,
|
||||||
|
+ addr.ifr_hwaddr.sa_data[4] & 0xff,
|
||||||
|
+ addr.ifr_hwaddr.sa_data[5] & 0xff);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
// Grok the server, port, and device.
|
||||||
|
if (optind < argc) {
|
||||||
|
gpsd_source_spec(argv[optind], &gpsd_source);
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
|
@ -0,0 +1,58 @@
|
||||||
|
From 901b3f9b6747eca8893ecaae824be396a6a4b5db Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oliver Smith <osmith@sysmocom.de>
|
||||||
|
Date: Tue, 13 Dec 2022 15:37:15 +0100
|
||||||
|
Subject: [PATCH] gps2udp: leave argv untouched
|
||||||
|
|
||||||
|
Rebase of leave-argv-untouched.patch we carried. Doesn't seem important,
|
||||||
|
but to keep the behavior consistent. Originally added with the following
|
||||||
|
commit message to meta-sysmocom-bsp.git:
|
||||||
|
|
||||||
|
commit 26d74189eb2023ce14af8dd41b36cd388ab8bebb
|
||||||
|
Author: Holger Hans Peter Freyther <holger@moiji-mobile.com>
|
||||||
|
Date: Tue Jul 15 08:28:42 2014 +0200
|
||||||
|
|
||||||
|
gpsd: Do not mess with the argv of the process
|
||||||
|
|
||||||
|
Henning got really confused that the "a.b.c:1234" he passed to
|
||||||
|
gps2udp showed up as "a.b.c 1234" in the kernel cmdline. Use
|
||||||
|
strdup to take a copy of it.
|
||||||
|
|
||||||
|
Fixes: SYS#424
|
||||||
|
---
|
||||||
|
clients/gps2udp.c | 6 +++++-
|
||||||
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/clients/gps2udp.c b/clients/gps2udp.c
|
||||||
|
index d27814f24..81d141fa2 100644
|
||||||
|
--- a/clients/gps2udp.c
|
||||||
|
+++ b/clients/gps2udp.c
|
||||||
|
@@ -436,6 +436,7 @@ static unsigned int AISGetInt(unsigned char *bitbytes, unsigned int sp,
|
||||||
|
|
||||||
|
int main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
+ int i;
|
||||||
|
bool daemonize = false;
|
||||||
|
long count = -1;
|
||||||
|
char *udphostport[MAX_UDP_DEST];
|
||||||
|
@@ -526,7 +527,7 @@ int main(int argc, char **argv)
|
||||||
|
"gps2udp: too many UDP destinations (max=%d).\n",
|
||||||
|
MAX_UDP_DEST);
|
||||||
|
} else {
|
||||||
|
- udphostport[udpchannel++] = optarg;
|
||||||
|
+ udphostport[udpchannel++] = strdup(optarg);
|
||||||
|
if (0 < debug) {
|
||||||
|
(void)fprintf(stdout, "UDP %s added.\n", optarg);
|
||||||
|
}
|
||||||
|
@@ -686,6 +687,9 @@ int main(int argc, char **argv)
|
||||||
|
} // end len > 3
|
||||||
|
} // end for (;;)
|
||||||
|
|
||||||
|
+ for (i = 0; i < udpchannel; ++i)
|
||||||
|
+ free(udphostport[i]);
|
||||||
|
+
|
||||||
|
// This is an infinite loop, should never be here
|
||||||
|
(void)fprintf (stderr, "gpsd2udp ERROR abnormal exit\n");
|
||||||
|
exit (-1);
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
From 9b12594ed0ce769d923a3b4f4d42c3b25caa87d3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oliver Smith <osmith@sysmocom.de>
|
||||||
|
Date: Tue, 13 Dec 2022 15:25:52 +0100
|
||||||
|
Subject: [PATCH] tsip: configure and enable 1PPS
|
||||||
|
|
||||||
|
Rebase of gpsd-tsip-pps.patch we have been carrying:
|
||||||
|
|
||||||
|
From www/time-service-intro.adoc:
|
||||||
|
> GPS enables receivers to generate a pulse-per-second
|
||||||
|
> signal ("1PPS" or just "PPS") accurate to the top of the current
|
||||||
|
> UTC second within 50 ns.
|
||||||
|
---
|
||||||
|
drivers/driver_tsip.c | 20 ++++++++++++++++++++
|
||||||
|
1 file changed, 20 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/driver_tsip.c b/drivers/driver_tsip.c
|
||||||
|
index 57b97513c..673bbef7e 100644
|
||||||
|
--- a/drivers/driver_tsip.c
|
||||||
|
+++ b/drivers/driver_tsip.c
|
||||||
|
@@ -4288,6 +4288,26 @@ void configuration_packets_generic(struct gps_device_t *session)
|
||||||
|
/* Primary Receiver Configuration Parameters Request (0xbb-00)
|
||||||
|
* returns Primary Receiver Configuration Block (0xbb-00) */
|
||||||
|
(void)tsip_write1(session, "\xbb\x00", 2);
|
||||||
|
+
|
||||||
|
+ GPSD_LOG(LOG_PROG, &session->context->errout,
|
||||||
|
+ "Configuring + Enabling 1PPS\n");
|
||||||
|
+ /* enable 1pps */
|
||||||
|
+ putbyte(buf, 0, 0x8e);
|
||||||
|
+ putbyte(buf, 1, 0x4a);
|
||||||
|
+ putbyte(buf, 2, 0x01);
|
||||||
|
+ (void)tsip_write1(session, buf, 3);
|
||||||
|
+
|
||||||
|
+ /* request PPS only if at least one sat is visible */
|
||||||
|
+ putbyte(buf, 0, 0x8e);
|
||||||
|
+ putbyte(buf, 1, 0x4e);
|
||||||
|
+ putbyte(buf, 2, 0x03);
|
||||||
|
+ (void)tsip_write1(session, buf, 3);
|
||||||
|
+
|
||||||
|
+ /* request PPS and TSIP to use UTC time, not GPS */
|
||||||
|
+ putbyte(buf, 0, 0x8e);
|
||||||
|
+ putbyte(buf, 1, 0xa2);
|
||||||
|
+ putbyte(buf, 2, 0x03);
|
||||||
|
+ (void)tsip_write1(session, buf, 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* configure Acutime Gold to a known state */
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
From 221681eeebd621287bd7587475da27d4e7dd17fc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oliver Smith <osmith@sysmocom.de>
|
||||||
|
Date: Tue, 13 Dec 2022 17:53:41 +0100
|
||||||
|
Subject: [PATCH] SConscript: force use of -pthread
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
With gpsd 3.24, the build system fails to properly detect that our GCC
|
||||||
|
supports -pthread. When attempting to build without it, the build fails
|
||||||
|
as follows.
|
||||||
|
|
||||||
|
…/ld: gpsd-3.24/libgpsd.a(ppsthread.o): undefined reference to symbol 'pthread_create@@GLIBC_2.4'
|
||||||
|
…/tmp/ERROR: scons build execution failed.
|
||||||
|
…/gpsd/3.24-r0/recipe-sysroot/lib/libpthread.so.0: error adding symbols: DSO missing from command line
|
||||||
|
| collect2: error: ld returned 1 exit status
|
||||||
|
---
|
||||||
|
SConscript | 4 +---
|
||||||
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/SConscript b/SConscript
|
||||||
|
index ddffe068d..ec660c458 100644
|
||||||
|
--- a/SConscript
|
||||||
|
+++ b/SConscript
|
||||||
|
@@ -942,9 +942,7 @@ if not cleaning and not helping:
|
||||||
|
if not config.CheckCC():
|
||||||
|
announce("ERROR: CC doesn't work")
|
||||||
|
|
||||||
|
- if ((config.CheckCompilerOption("-pthread") and
|
||||||
|
- not config.env['target_platform'].startswith('darwin'))):
|
||||||
|
- config.env.MergeFlags("-pthread")
|
||||||
|
+ config.env.MergeFlags("-pthread")
|
||||||
|
|
||||||
|
confdefs = ["/* gpsd_config.h generated by scons, do not hand-hack. */\n"]
|
||||||
|
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
|
@ -22,26 +22,26 @@
|
||||||
SUBSYSTEM!="tty", GOTO="gpsd_rules_end"
|
SUBSYSTEM!="tty", GOTO="gpsd_rules_end"
|
||||||
|
|
||||||
# Prolific Technology, Inc. PL2303 Serial Port
|
# Prolific Technology, Inc. PL2303 Serial Port
|
||||||
ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
|
ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug"
|
||||||
# ATEN International Co., Ltd UC-232A Serial Port [pl2303]
|
# ATEN International Co., Ltd UC-232A Serial Port [pl2303]
|
||||||
ATTR{idVendor}=="0557", ATTR{idProduct}=="2008", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
|
ATTR{idVendor}=="0557", ATTR{idProduct}=="2008", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug"
|
||||||
# FTDI 8U232AM
|
# FTDI 8U232AM
|
||||||
ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
|
ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug"
|
||||||
# Cypress M8/CY7C64013 (DeLorme uses these)
|
# Cypress M8/CY7C64013 (DeLorme uses these)
|
||||||
ATTR{idVendor}=="1163", ATTR{idProduct}=="0100", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
|
ATTR{idVendor}=="1163", ATTR{idProduct}=="0100", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug"
|
||||||
# PS-360 OEM (Microsoft GPS sold with Street and Trips 2005)
|
# PS-360 OEM (Microsoft GPS sold with Street and Trips 2005)
|
||||||
ATTR{idVendor}=="067b", ATTR{idProduct}=="aaa0", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
|
ATTR{idVendor}=="067b", ATTR{idProduct}=="aaa0", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug"
|
||||||
# Garmin International GPSmap, various models (tested with Garmin GPS 18 USB)
|
# Garmin International GPSmap, various models (tested with Garmin GPS 18 USB)
|
||||||
ATTR{idVendor}=="091e", ATTR{idProduct}=="0003", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
|
ATTR{idVendor}=="091e", ATTR{idProduct}=="0003", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug"
|
||||||
# Cygnal Integrated Products, Inc. CP210x Composite Device (Used by Holux m241)
|
# Cygnal Integrated Products, Inc. CP210x Composite Device (Used by Holux m241)
|
||||||
ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
|
ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug"
|
||||||
# u-blox AG, u-blox 5 (tested with Navilock NL-402U)
|
# u-blox AG, u-blox 5 (tested with Navilock NL-402U)
|
||||||
ATTR{idVendor}=="1546", ATTR{idProduct}=="01a5", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
|
ATTR{idVendor}=="1546", ATTR{idProduct}=="01a5", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug"
|
||||||
# FTDI FT232
|
# FTDI FT232
|
||||||
ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
|
ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug"
|
||||||
# u-blox 4
|
# u-blox 4
|
||||||
ATTR{idVendor}=="1546", ATTR{idProduct}=="01a4", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
|
ATTR{idVendor}=="1546", ATTR{idProduct}=="01a4", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug"
|
||||||
|
|
||||||
ACTION=="remove", RUN+="/lib/udev/gpsd.hotplug.wrapper"
|
ACTION=="remove", RUN+="/lib/udev/gpsd.hotplug"
|
||||||
|
|
||||||
LABEL="gpsd_rules_end"
|
LABEL="gpsd_rules_end"
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
https://bugs.gentoo.org/391299
|
|
||||||
|
|
||||||
split up linking flags into multiple arguments
|
|
||||||
|
|
||||||
Index: gpsd-3.10/SConstruct
|
|
||||||
===================================================================
|
|
||||||
--- gpsd-3.10.orig/SConstruct 2017-03-28 23:47:02.815665786 +0200
|
|
||||||
+++ gpsd-3.10/SConstruct 2017-03-28 23:47:40.463666285 +0200
|
|
||||||
@@ -250,7 +250,7 @@
|
|
||||||
env.Replace(**{j: os.getenv(i)})
|
|
||||||
for flag in ["LDFLAGS", "LINKFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
|
|
||||||
if os.environ.has_key(flag):
|
|
||||||
- env.MergeFlags({flag : [os.getenv(flag)]})
|
|
||||||
+ env.MergeFlags({flag : Split(os.getenv(flag))})
|
|
||||||
|
|
||||||
|
|
||||||
# Keep scan-build options in the environment
|
|
|
@ -1,28 +1,25 @@
|
||||||
SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices"
|
SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices"
|
||||||
SECTION = "console/network"
|
SECTION = "console/network"
|
||||||
LICENSE = "BSD"
|
LICENSE = "BSD-2-Clause"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=7a5d174db44ec45f9638b2c747806821"
|
||||||
DEPENDS = "ncurses python"
|
DEPENDS = "ncurses python"
|
||||||
PROVIDES = "virtual/gpsd"
|
PROVIDES = "virtual/gpsd"
|
||||||
|
|
||||||
PR = "r3.20"
|
PR = "r1"
|
||||||
|
|
||||||
SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
|
SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
|
||||||
file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \
|
|
||||||
file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \
|
|
||||||
file://gpsd-3.3-ldflags.patch \
|
|
||||||
file://no-rpath-please.patch \
|
|
||||||
file://gpsd-tsip-pps.patch \
|
|
||||||
file://leave-argv-untouched.patch \
|
|
||||||
file://0001-gps2udp-Add-a-label-timestamp-and-mac-address-to-eac.patch \
|
file://0001-gps2udp-Add-a-label-timestamp-and-mac-address-to-eac.patch \
|
||||||
|
file://0002-gps2udp-leave-argv-untouched.patch \
|
||||||
|
file://0003-tsip-configure-and-enable-1PPS.patch \
|
||||||
|
file://0004-SConscript-force-use-of-pthread.patch \
|
||||||
file://gpsd-default \
|
file://gpsd-default \
|
||||||
file://gpsd \
|
file://gpsd \
|
||||||
file://60-gpsd.rules \
|
file://60-gpsd.rules \
|
||||||
file://gpsd.service \
|
file://gpsd.service \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "fc5b03aae38b9b5b6880b31924d0ace3"
|
SRC_URI[md5sum] = "c4e743a507a137c00fdb28ef35b145d0"
|
||||||
SRC_URI[sha256sum] = "706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320"
|
SRC_URI[sha256sum] = "00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c"
|
||||||
|
|
||||||
inherit scons update-rc.d systemd
|
inherit scons update-rc.d systemd
|
||||||
|
|
||||||
|
@ -64,9 +61,10 @@ EXTRA_OESCONS = " \
|
||||||
tripmate='false' \
|
tripmate='false' \
|
||||||
usb='false' \
|
usb='false' \
|
||||||
chrpath='false' \
|
chrpath='false' \
|
||||||
systemd='${SYSTEMD_OESCONS}' \
|
systemd='${SYSTEMD_OESCONS}' \
|
||||||
libdir='${libdir}' \
|
libdir='${libdir}' \
|
||||||
${PACKAGECONFIG_CONFARGS} \
|
manbuild='false' \
|
||||||
|
${PACKAGECONFIG_CONFARGS} \
|
||||||
"
|
"
|
||||||
# this cannot be used, because then chrpath is not found and only static lib is built
|
# this cannot be used, because then chrpath is not found and only static lib is built
|
||||||
# target=${HOST_SYS}
|
# target=${HOST_SYS}
|
||||||
|
@ -109,7 +107,7 @@ do_install_append() {
|
||||||
#support for systemd
|
#support for systemd
|
||||||
install -d ${D}${systemd_system_unitdir}/
|
install -d ${D}${systemd_system_unitdir}/
|
||||||
install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service
|
install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service
|
||||||
install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_system_unitdir}/${BPN}.socket
|
install -m 0644 ${BPN}-${PV}/systemd/${BPN}.socket ${D}${systemd_system_unitdir}/${BPN}.socket
|
||||||
}
|
}
|
||||||
|
|
||||||
pkg_postinst_${PN}-conf() {
|
pkg_postinst_${PN}-conf() {
|
|
@ -6,13 +6,13 @@ DEPENDS = "gpsd"
|
||||||
RDEPENDS_${PN} = "libgps"
|
RDEPENDS_${PN} = "libgps"
|
||||||
|
|
||||||
PE = "1"
|
PE = "1"
|
||||||
PR = "r14"
|
PR = "r0"
|
||||||
PV = "0.2+git${SRCPV}"
|
PV = "0.3+git${SRCPV}"
|
||||||
|
|
||||||
SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \
|
SRC_URI = "git://gitea.sysmocom.de/sysmocom/gpsdate.git;branch=master;protocol=https \
|
||||||
file://gpsdate.default \
|
file://gpsdate.default \
|
||||||
"
|
"
|
||||||
SRCREV = "cd7b77ef311f317aac7a067308a94e46811a20f2"
|
SRCREV = "68bcf620b4dc37eefae009175b3edb7ef10a5f0a"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
INITSCRIPT_NAME = "gpsdate"
|
INITSCRIPT_NAME = "gpsdate"
|
||||||
|
|
|
@ -7,7 +7,7 @@ PR = "r0"
|
||||||
|
|
||||||
DEPENDS = "libmnl"
|
DEPENDS = "libmnl"
|
||||||
|
|
||||||
SRC_URI = "git://git.netfilter.org/libnetfilter_acct;branch=master \
|
SRC_URI = "git://git.netfilter.org/libnetfilter_acct;protocol=https;branch=master \
|
||||||
file://0001-add-JSON-output-format.patch \
|
file://0001-add-JSON-output-format.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "a9fea38024e6bde9118cc12bc8417b207ffc4da9"
|
SRCREV = "a9fea38024e6bde9118cc12bc8417b207ffc4da9"
|
||||||
|
|
|
@ -8,7 +8,7 @@ RRECOMMENDS_${PN} = "kernel-module-tun"
|
||||||
|
|
||||||
PR="r3"
|
PR="r3"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/ntop/n2n.git;branch=master \
|
SRC_URI = "git://github.com/ntop/n2n.git;protocol=https;branch=master \
|
||||||
file://edge.sh \
|
file://edge.sh \
|
||||||
file://n2n-edge@.service \
|
file://n2n-edge@.service \
|
||||||
file://0001-Makefile-Allow-cross-compilation-environment-to-spec.patch"
|
file://0001-Makefile-Allow-cross-compilation-environment-to-spec.patch"
|
||||||
|
|
|
@ -8,7 +8,7 @@ PR="r1"
|
||||||
|
|
||||||
DEPENDS = "libmnl libnetfilter-acct"
|
DEPENDS = "libmnl libnetfilter-acct"
|
||||||
|
|
||||||
SRC_URI = "git://git.netfilter.org/nfacct;branch=master \
|
SRC_URI = "git://git.netfilter.org/nfacct;protocol=https;branch=master \
|
||||||
file://0001-Add-JSON-output-formatting-to-nfacct-utility.patch \
|
file://0001-Add-JSON-output-formatting-to-nfacct-utility.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "4437682babe86de7435d4fc839437f99e998b79c"
|
SRCREV = "4437682babe86de7435d4fc839437f99e998b79c"
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
From ea179d83b0aa62719d90748cd1fb260f40055f15 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Yi Zhao <yi.zhao@windriver.com>
|
||||||
|
Date: Mon, 13 Jun 2022 22:44:28 +0800
|
||||||
|
Subject: [PATCH] configure.ac: eliminate build path from openvpn --version
|
||||||
|
option
|
||||||
|
|
||||||
|
Before the patch:
|
||||||
|
$ openvpn --version
|
||||||
|
OpenVPN 2.5.7 x86_64-poky-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL]
|
||||||
|
[snip]
|
||||||
|
Compile time defines: enable_async_push=no enable_comp_stub=no
|
||||||
|
[snip]
|
||||||
|
with_crypto_library=openssl with_gnu_ld=yes
|
||||||
|
with_libtool_sysroot=/buildarea/build/tmp/work/core2-64-poky-linux/openvpn/2.5.7-r0/recipe-sysroot
|
||||||
|
with_mem_check=no with_openssl_engine=auto
|
||||||
|
|
||||||
|
After the patch:
|
||||||
|
$ openvpn --version
|
||||||
|
OpenVPN 2.5.7 x86_64-poky-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL]
|
||||||
|
[snip]
|
||||||
|
Compile time defines: enable_async_push=no enable_comp_stub=no
|
||||||
|
[snip]
|
||||||
|
with_crypto_library=openssl with_gnu_ld=yes with_mem_check=no
|
||||||
|
with_openssl_engine=auto
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [embedded specific]
|
||||||
|
|
||||||
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||||
|
---
|
||||||
|
configure.ac | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 2f5f6bc..eddcbc5 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -1377,7 +1377,7 @@ if test "${enable_async_push}" = "yes"; then
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
-CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`"
|
||||||
|
+CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*=' | grep -v 'libtool_sysroot'`"
|
||||||
|
AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings])
|
||||||
|
|
||||||
|
TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID"
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
|
@ -1,32 +1,40 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
#
|
#
|
||||||
# Original version by Robert Leslie
|
# Original version by Robert Leslie
|
||||||
# <rob@mars.org>, edited by iwj and cs
|
# <rob@mars.org>, edited by iwj and cs
|
||||||
# Modified for openvpn by Alberto Gonzalez Iniesta <agi@agi.as>
|
# Modified for openvpn by Alberto Gonzalez Iniesta <agi@agi.as>
|
||||||
# Modified for restarting / starting / stopping single tunnels by Richard Mueller <mueller@teamix.net>
|
# Modified for restarting / starting / stopping single tunnels by Richard Mueller <mueller@teamix.net>
|
||||||
|
# Modified for respecting pid file on service start by Fabian Klemp <fabian.klemp@axino-group.com>
|
||||||
|
|
||||||
test $DEBIAN_SCRIPT_DEBUG && set -v -x
|
test $DEBIAN_SCRIPT_DEBUG && set -v -x
|
||||||
|
|
||||||
DAEMON=/usr/sbin/openvpn
|
DAEMON=/usr/sbin/openvpn
|
||||||
CONFIG_DIR=/etc/openvpn
|
CONFIG_DIR=/etc/openvpn
|
||||||
test -x $DAEMON || exit 0
|
test -x $DAEMON || exit 0
|
||||||
test -d $CONFIG_DIR || exit 0
|
test -d $CONFIG_DIR || exit 0
|
||||||
|
|
||||||
start_vpn () {
|
start_vpn () {
|
||||||
modprobe tun >/dev/null 2>&1 || true
|
modprobe tun >/dev/null 2>&1 || true
|
||||||
$DAEMON --daemon --writepid /var/run/openvpn.$NAME.pid \
|
start-stop-daemon --start --quiet --pidfile /var/run/openvpn.$NAME.pid \
|
||||||
--config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || echo -n " FAILED->"
|
--exec $DAEMON -- \
|
||||||
|
--daemon --writepid /var/run/openvpn.$NAME.pid \
|
||||||
|
--config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || rc="$?"
|
||||||
|
case $rc in
|
||||||
|
1) echo -n " ALREADY STARTED->";;
|
||||||
|
3) echo -n " FAILED->";;
|
||||||
|
esac
|
||||||
echo -n " $NAME"
|
echo -n " $NAME"
|
||||||
}
|
}
|
||||||
|
|
||||||
stop_vpn () {
|
stop_vpn () {
|
||||||
kill `cat $PIDFILE` || true
|
kill `cat $PIDFILE` || true
|
||||||
rm $PIDFILE
|
rm $PIDFILE
|
||||||
}
|
}
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
echo -n "Starting openvpn:"
|
echo -n "Starting openvpn:"
|
||||||
|
|
||||||
if test -z $2 ; then
|
if test -z $2 ; then
|
||||||
for CONFIG in `cd $CONFIG_DIR; ls *.conf 2> /dev/null`; do
|
for CONFIG in `cd $CONFIG_DIR; ls *.conf 2> /dev/null`; do
|
||||||
NAME=${CONFIG%%.conf}
|
NAME=${CONFIG%%.conf}
|
||||||
|
@ -41,11 +49,11 @@ start)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
echo "."
|
echo "."
|
||||||
|
|
||||||
;;
|
;;
|
||||||
stop)
|
stop)
|
||||||
echo -n "Stopping openvpn:"
|
echo -n "Stopping openvpn:"
|
||||||
|
|
||||||
if test -z $2 ; then
|
if test -z $2 ; then
|
||||||
for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do
|
for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do
|
||||||
NAME=`echo $PIDFILE | cut -c18-`
|
NAME=`echo $PIDFILE | cut -c18-`
|
||||||
|
@ -87,7 +95,7 @@ reload|force-reload)
|
||||||
done
|
done
|
||||||
echo "."
|
echo "."
|
||||||
;;
|
;;
|
||||||
|
|
||||||
restart)
|
restart)
|
||||||
$0 stop $2
|
$0 stop $2
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# This systemd generator creates dependency symlinks that make all OpenVPN
|
|
||||||
# tunnels listed in /etc/default/openvpn's AUTOSTART be started/stopped/reloaded
|
|
||||||
# when openvpn.service is started/stopped/reloaded.
|
|
||||||
|
|
||||||
set -eu
|
|
||||||
|
|
||||||
GENDIR="$1"
|
|
||||||
WANTDIR="$1/openvpn.service.wants"
|
|
||||||
SERVICEFILE="/lib/systemd/system/openvpn@.service"
|
|
||||||
AUTOSTART="all"
|
|
||||||
CONFIG_DIR=/etc/openvpn
|
|
||||||
|
|
||||||
mkdir -p "$WANTDIR"
|
|
||||||
|
|
||||||
if test -e /etc/default/openvpn ; then
|
|
||||||
. /etc/default/openvpn
|
|
||||||
fi
|
|
||||||
|
|
||||||
# No VPNs automatically started
|
|
||||||
if test "x$AUTOSTART" = "xnone" ; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$AUTOSTART" = "xall" -o -z "$AUTOSTART" ; then
|
|
||||||
for CONFIG in `cd $CONFIG_DIR; ls *.conf 2> /dev/null`; do
|
|
||||||
NAME=${CONFIG%%.conf}
|
|
||||||
ln -s "$SERVICEFILE" "$WANTDIR/openvpn@$NAME.service"
|
|
||||||
done
|
|
||||||
else
|
|
||||||
for NAME in $AUTOSTART ; do
|
|
||||||
if test -e $CONFIG_DIR/$NAME.conf ; then
|
|
||||||
ln -s "$SERVICEFILE" "$WANTDIR/openvpn@$NAME.service"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
|
@ -1,63 +0,0 @@
|
||||||
SUMMARY = "A full-featured SSL VPN solution via tun device."
|
|
||||||
HOMEPAGE = "http://openvpn.sourceforge.net"
|
|
||||||
SECTION = "console/network"
|
|
||||||
LICENSE = "GPLv2"
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c"
|
|
||||||
DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
|
|
||||||
|
|
||||||
inherit autotools
|
|
||||||
|
|
||||||
PR = "r3"
|
|
||||||
|
|
||||||
SRC_URI = "http://swupdate.openvpn.org/community/releases/openvpn-${PV}.tar.gz \
|
|
||||||
file://openvpn \
|
|
||||||
file://openvpn-generator \
|
|
||||||
file://openvpn@.service \
|
|
||||||
file://openvpn.service"
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "6ca03fe0fd093e0d01601abee808835c"
|
|
||||||
SRC_URI[sha256sum] = "7baed2ff39c12e1a1a289ec0b46fcc49ff094ca58b8d8d5f29b36ac649ee5b26"
|
|
||||||
|
|
||||||
CFLAGS += "-fno-inline"
|
|
||||||
|
|
||||||
# I want openvpn to be able to read password from file (hrw)
|
|
||||||
EXTRA_OECONF += "--enable-password-save --enable-iproute2"
|
|
||||||
EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}"
|
|
||||||
|
|
||||||
# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host.
|
|
||||||
EXTRA_OECONF += "IPROUTE=/sbin/ip"
|
|
||||||
|
|
||||||
do_install_append() {
|
|
||||||
install -d ${D}/${sysconfdir}/init.d
|
|
||||||
install -d ${D}/${sysconfdir}/openvpn
|
|
||||||
install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
|
|
||||||
|
|
||||||
# systemd files
|
|
||||||
install -d ${D}${systemd_system_unitdir}
|
|
||||||
install -d ${D}${systemd_unitdir}/system-generators
|
|
||||||
install -m 0644 ${WORKDIR}/openvpn.service ${D}${systemd_system_unitdir}
|
|
||||||
install -m 0644 ${WORKDIR}/openvpn@.service ${D}${systemd_system_unitdir}
|
|
||||||
install -m 0755 ${WORKDIR}/openvpn-generator ${D}${systemd_unitdir}/system-generators
|
|
||||||
}
|
|
||||||
|
|
||||||
RDEPENDS_${PN} += "update-rc.d"
|
|
||||||
RRECOMMENDS_${PN} = "kernel-module-tun"
|
|
||||||
|
|
||||||
FILES_${PN}-dbg += "${libdir}/openvpn/plugins/.debug"
|
|
||||||
|
|
||||||
# Don't go through the systemd.bbclass as we do not want magic to happen
|
|
||||||
# during install and upgrade. Simply ship the files.
|
|
||||||
FILES_${PN} += "${systemd_unitdir}"
|
|
||||||
|
|
||||||
pkg_postinst_${PN} () {
|
|
||||||
if [ "x$D" != "x" ]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -L /etc/rc2.d/S*openvpn ]; then
|
|
||||||
update-rc.d -f openvpn remove
|
|
||||||
if [ ! -L /etc/systemd/system/multi-user.target.wants/openvpn.service ]; then
|
|
||||||
ln -s '/lib/systemd/system/openvpn.service' '/etc/systemd/system/multi-user.target.wants/openvpn.service'
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
|
@ -0,0 +1,87 @@
|
||||||
|
SUMMARY = "A full-featured SSL VPN solution via tun device."
|
||||||
|
HOMEPAGE = "https://openvpn.net/"
|
||||||
|
SECTION = "net"
|
||||||
|
LICENSE = "GPL-2.0-only"
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=b76abd82c14ee01cc34c4ff5e3627b89"
|
||||||
|
DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
|
||||||
|
|
||||||
|
inherit autotools systemd update-rc.d pkgconfig
|
||||||
|
|
||||||
|
PR = "r2"
|
||||||
|
|
||||||
|
SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \
|
||||||
|
file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \
|
||||||
|
file://openvpn \
|
||||||
|
file://openvpn@.service \
|
||||||
|
file://openvpn.service \
|
||||||
|
"
|
||||||
|
|
||||||
|
UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads"
|
||||||
|
|
||||||
|
SRC_URI[sha256sum] = "a6f315b7231d44527e65901ff646f87d7f07862c87f33531daa109fb48c53db2"
|
||||||
|
|
||||||
|
# CVE-2020-7224 and CVE-2020-27569 are for Aviatrix OpenVPN client, not for openvpn.
|
||||||
|
CVE_CHECK_IGNORE += "CVE-2020-7224 CVE-2020-27569"
|
||||||
|
|
||||||
|
INITSCRIPT_PACKAGES = "${PN}"
|
||||||
|
INITSCRIPT_NAME_${PN} = "openvpn"
|
||||||
|
INITSCRIPT_PARAMS_${PN} = "start 10 2 3 4 5 . stop 70 0 1 6 ."
|
||||||
|
|
||||||
|
CFLAGS += "-fno-inline"
|
||||||
|
|
||||||
|
# I want openvpn to be able to read password from file (hrw)
|
||||||
|
EXTRA_OECONF += "--enable-iproute2"
|
||||||
|
EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}"
|
||||||
|
|
||||||
|
# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host.
|
||||||
|
EXTRA_OECONF += "IPROUTE=${base_sbindir}/ip"
|
||||||
|
|
||||||
|
EXTRA_OECONF += "SYSTEMD_UNIT_DIR=${systemd_system_unitdir} \
|
||||||
|
TMPFILES_DIR=${nonarch_libdir}/tmpfiles.d \
|
||||||
|
"
|
||||||
|
|
||||||
|
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
|
||||||
|
${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
|
||||||
|
"
|
||||||
|
|
||||||
|
PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
|
||||||
|
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
|
||||||
|
|
||||||
|
do_install_append() {
|
||||||
|
install -d ${D}/${sysconfdir}/init.d
|
||||||
|
install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
|
||||||
|
|
||||||
|
install -d ${D}/${sysconfdir}/openvpn
|
||||||
|
install -d ${D}/${sysconfdir}/openvpn/server
|
||||||
|
install -d ${D}/${sysconfdir}/openvpn/client
|
||||||
|
|
||||||
|
install -d ${D}/${sysconfdir}/openvpn/sample
|
||||||
|
install -m 644 ${S}/sample/sample-config-files/loopback-server ${D}${sysconfdir}/openvpn/sample/loopback-server.conf
|
||||||
|
install -m 644 ${S}/sample/sample-config-files/loopback-client ${D}${sysconfdir}/openvpn/sample/loopback-client.conf
|
||||||
|
install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-config-files
|
||||||
|
install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys
|
||||||
|
install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-scripts
|
||||||
|
install -m 644 ${S}/sample/sample-config-files/* ${D}${sysconfdir}/openvpn/sample/sample-config-files
|
||||||
|
install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys
|
||||||
|
install -m 644 ${S}/sample/sample-scripts/* ${D}${sysconfdir}/openvpn/sample/sample-scripts
|
||||||
|
|
||||||
|
install -d -m 710 ${D}/${localstatedir}/lib/openvpn
|
||||||
|
|
||||||
|
# Keep openvpn@.service, openvpn.service to match manuals (SYS#6303)
|
||||||
|
install -m 0644 ${WORKDIR}/openvpn@.service ${D}${systemd_system_unitdir}
|
||||||
|
install -m 0644 ${WORKDIR}/openvpn.service ${D}${systemd_system_unitdir}
|
||||||
|
}
|
||||||
|
|
||||||
|
PACKAGES =+ " ${PN}-sample "
|
||||||
|
|
||||||
|
RRECOMMENDS_${PN} = "kernel-module-tun"
|
||||||
|
|
||||||
|
FILES_${PN}-dbg += "${libdir}/openvpn/plugins/.debug"
|
||||||
|
FILES_${PN} += "${systemd_system_unitdir}/openvpn-server@.service \
|
||||||
|
${systemd_system_unitdir}/openvpn-client@.service \
|
||||||
|
${systemd_system_unitdir}/openvpn@.service \
|
||||||
|
${systemd_system_unitdir}/openvpn.service \
|
||||||
|
${nonarch_libdir}/tmpfiles.d \
|
||||||
|
"
|
||||||
|
FILES_${PN}-sample = "${sysconfdir}/openvpn/sample/ \
|
||||||
|
"
|
|
@ -7,7 +7,7 @@ PR = "r0"
|
||||||
|
|
||||||
SRCREV = "b59217c971603a30648b041c84f85159afb2ec31"
|
SRCREV = "b59217c971603a30648b041c84f85159afb2ec31"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/joshmarshall/jsonrpclib.git"
|
SRC_URI = "git://github.com/joshmarshall/jsonrpclib.git;protocol=https"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit distutils
|
inherit distutils
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
# Package OpenSSH's sftp server, so the openssh client finds it and doesn't
|
||||||
|
# need to be run with a flag to use the legacy SCP protocol (SYS#6403)
|
||||||
|
SUMMARY = "OpenSSH's sftp-server"
|
||||||
|
DESCRIPTION = "OpenSSH's sftp-server, to be used with dropbear"
|
||||||
|
HOMEPAGE = "http://www.openssh.com/"
|
||||||
|
SECTION = "console/network"
|
||||||
|
LICENSE = "BSD"
|
||||||
|
LIC_FILES_CHKSUM = "file://LICENCE;md5=072979064e691d342002f43cd89c0394"
|
||||||
|
DEPENDS = ""
|
||||||
|
SRC_URI = "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz"
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "3430d5e6e71419e28f440a42563cb553"
|
||||||
|
SRC_URI[sha256sum] = "e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8"
|
||||||
|
|
||||||
|
inherit autotools
|
||||||
|
|
||||||
|
EXTRA_OECONF += "--without-openssl --without-zlib"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/openssh-${PV}"
|
||||||
|
|
||||||
|
do_compile() {
|
||||||
|
oe_runmake sftp-server
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install() {
|
||||||
|
install -Dm755 "${B}"/sftp-server \
|
||||||
|
-t "${D}"/usr/libexec/
|
||||||
|
}
|
||||||
|
|
||||||
|
FILES_${PN} = "/usr/libexec/sftp-server"
|
|
@ -1,4 +0,0 @@
|
||||||
THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
|
|
||||||
FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
|
|
||||||
|
|
||||||
PRINC="4"
|
|
|
@ -1,113 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: sshd
|
|
||||||
# Required-Start: $remote_fs $syslog $networking
|
|
||||||
# Required-Stop: $remote_fs $syslog
|
|
||||||
# Default-Start: 2 3 4 5
|
|
||||||
# Default-Stop: 1
|
|
||||||
# Short-Description: Dropbear Secure Shell server
|
|
||||||
### END INIT INFO
|
|
||||||
#
|
|
||||||
# Do not configure this file. Edit /etc/default/dropbear instead!
|
|
||||||
#
|
|
||||||
|
|
||||||
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
|
||||||
DAEMON=/usr/sbin/dropbear
|
|
||||||
NAME=dropbear
|
|
||||||
DESC="Dropbear SSH server"
|
|
||||||
PIDFILE=/var/run/dropbear.pid
|
|
||||||
|
|
||||||
DROPBEAR_PORT=22
|
|
||||||
DROPBEAR_EXTRA_ARGS=
|
|
||||||
NO_START=0
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
test ! -r /etc/default/dropbear || . /etc/default/dropbear
|
|
||||||
test "$NO_START" = "0" || exit 0
|
|
||||||
test -x "$DAEMON" || exit 0
|
|
||||||
test ! -h /var/service/dropbear || exit 0
|
|
||||||
|
|
||||||
readonly_rootfs=0
|
|
||||||
for flag in `awk '{ if ($2 == "/") { split($4,FLAGS,",") } }; END { for (f in FLAGS) print FLAGS[f] }' </proc/mounts`; do
|
|
||||||
case $flag in
|
|
||||||
ro)
|
|
||||||
readonly_rootfs=1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ $readonly_rootfs = "1" ]; then
|
|
||||||
mkdir -p /var/lib/dropbear
|
|
||||||
DROPBEAR_RSAKEY_DEFAULT="/var/lib/dropbear/dropbear_rsa_host_key"
|
|
||||||
DROPBEAR_DSSKEY_DEFAULT="/var/lib/dropbear/dropbear_dss_host_key"
|
|
||||||
else
|
|
||||||
DROPBEAR_RSAKEY_DEFAULT="/etc/dropbear/dropbear_rsa_host_key"
|
|
||||||
DROPBEAR_DSSKEY_DEFAULT="/etc/dropbear/dropbear_dss_host_key"
|
|
||||||
fi
|
|
||||||
|
|
||||||
test -z "$DROPBEAR_BANNER" || \
|
|
||||||
DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -b $DROPBEAR_BANNER"
|
|
||||||
test -n "$DROPBEAR_RSAKEY" || \
|
|
||||||
DROPBEAR_RSAKEY=$DROPBEAR_RSAKEY_DEFAULT
|
|
||||||
test -n "$DROPBEAR_DSSKEY" || \
|
|
||||||
DROPBEAR_DSSKEY=$DROPBEAR_DSSKEY_DEFAULT
|
|
||||||
test -n "$DROPBEAR_KEYTYPES" || \
|
|
||||||
DROPBEAR_KEYTYPES="rsa"
|
|
||||||
|
|
||||||
gen_keys() {
|
|
||||||
for t in $DROPBEAR_KEYTYPES; do
|
|
||||||
case $t in
|
|
||||||
rsa)
|
|
||||||
if [ -f "$DROPBEAR_RSAKEY" -a ! -s "$DROPBEAR_RSAKEY" ]; then
|
|
||||||
rm $DROPBEAR_RSAKEY
|
|
||||||
fi
|
|
||||||
test -f $DROPBEAR_RSAKEY || dropbearkey -t rsa -f $DROPBEAR_RSAKEY
|
|
||||||
;;
|
|
||||||
dsa)
|
|
||||||
if [ -f "$DROPBEAR_DSSKEY" -a ! -s "$DROPBEAR_DSSKEY" ]; then
|
|
||||||
rm $DROPBEAR_DSSKEY
|
|
||||||
fi
|
|
||||||
test -f $DROPBEAR_DSSKEY || dropbearkey -t dss -f $DROPBEAR_DSSKEY
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
echo -n "Starting $DESC: "
|
|
||||||
gen_keys
|
|
||||||
KEY_ARGS=""
|
|
||||||
test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
|
|
||||||
test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
|
|
||||||
start-stop-daemon -S -p $PIDFILE \
|
|
||||||
-x "$DAEMON" -- $KEY_ARGS \
|
|
||||||
-p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
|
|
||||||
echo "$NAME."
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
echo -n "Stopping $DESC: "
|
|
||||||
start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
|
|
||||||
echo "$NAME."
|
|
||||||
;;
|
|
||||||
restart|force-reload)
|
|
||||||
echo -n "Restarting $DESC: "
|
|
||||||
start-stop-daemon -K -x "$DAEMON" -p $PIDFILE
|
|
||||||
sleep 1
|
|
||||||
KEY_ARGS=""
|
|
||||||
test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
|
|
||||||
test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
|
|
||||||
start-stop-daemon -S -p $PIDFILE \
|
|
||||||
-x "$DAEMON" -- $KEY_ARGS \
|
|
||||||
-p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
|
|
||||||
echo "$NAME."
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
N=/etc/init.d/$NAME
|
|
||||||
echo "Usage: $N {start|stop|restart|force-reload}" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
exit 0
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Automount ROM partition with factory defaults
|
||||||
|
|
||||||
|
[Automount]
|
||||||
|
Where=/mnt/rom/factory
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
|
@ -0,0 +1,11 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Mount ROM partition with factory defaults
|
||||||
|
|
||||||
|
[Mount]
|
||||||
|
What=/dev/mtdblock8
|
||||||
|
Where=/mnt/rom/factory
|
||||||
|
Type=jffs2
|
||||||
|
Options=ro
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
|
@ -0,0 +1,8 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Automount user partition with default settings
|
||||||
|
|
||||||
|
[Automount]
|
||||||
|
Where=/mnt/rom/user
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
|
@ -0,0 +1,10 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Mount user partition with default settings
|
||||||
|
|
||||||
|
[Mount]
|
||||||
|
What=/dev/mtdblock9
|
||||||
|
Where=/mnt/rom/user
|
||||||
|
Type=jffs2
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
|
@ -0,0 +1,8 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Automount storage partition
|
||||||
|
|
||||||
|
[Automount]
|
||||||
|
Where=/mnt/storage
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
|
@ -0,0 +1,10 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Mount storage partition
|
||||||
|
|
||||||
|
[Mount]
|
||||||
|
What=/dev/mmcblk0p4
|
||||||
|
Where=/mnt/storage
|
||||||
|
Type=ext4
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
|
@ -1,52 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
# Start/stop the system devices remapping for OC-2G daemon.
|
|
||||||
#
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: oc2g-sysdev-remap
|
|
||||||
# Required-Start: $syslog $time
|
|
||||||
# Required-Stop: $syslog $time
|
|
||||||
# Default-Start: 2 3 4 5
|
|
||||||
# Default-Stop: 0 1 6
|
|
||||||
# Short-Description: Remapping all availble system devices of OC-2G platform in system to a easy to reach location
|
|
||||||
# Description: Accessible to all system devices related to OC-2G platform will be available at /var/oc2g
|
|
||||||
#
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
REMAP_DIR='/var/volatile/oc2g'
|
|
||||||
|
|
||||||
test -f /usr/bin/oc2g-sysdev-remap|| exit 0
|
|
||||||
|
|
||||||
. /etc/init.d/functions
|
|
||||||
|
|
||||||
log_daemon_msg () {
|
|
||||||
echo $@
|
|
||||||
}
|
|
||||||
|
|
||||||
log_end_msg () {
|
|
||||||
if test "$1" != "0"; then
|
|
||||||
echo "Error with $DESCRIPTION: $NAME"
|
|
||||||
fi
|
|
||||||
return $1
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start) log_daemon_msg "Starting system devices remapping script:" "oc2g-sysdev-remap"
|
|
||||||
mkdir -p ${REMAP_DIR}
|
|
||||||
/usr/bin/oc2g-sysdev-remap
|
|
||||||
log_end_msg $?
|
|
||||||
;;
|
|
||||||
stop) log_daemon_msg "Stopping system devices remapping script:" "oc2g-sysdev-remap"
|
|
||||||
test -d ${REMAP_DIR} && rm -rf ${REMAP_DIR}
|
|
||||||
;;
|
|
||||||
restart) log_daemon_msg "Restarting system devices remapping script:" "oc2oc2gg-sysdev-remap"
|
|
||||||
test -d ${REMAP_DIR} && rm -rf ${REMAP_DIR}
|
|
||||||
mkdir -p ${REMAP_DIR}
|
|
||||||
/usr/bin/oc2g-sysdev-remap
|
|
||||||
log_end_msg $?
|
|
||||||
;;
|
|
||||||
*) log_action_msg "Usage: /etc/init.d/oc2g-sysdev-remap {start|stop|restart}"
|
|
||||||
exit 2
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
exit 0
|
|
|
@ -1,21 +1,18 @@
|
||||||
[Unit]
|
[Unit]
|
||||||
SourcePath=/etc/init.d/oc2g-sysdev-remap
|
|
||||||
Description=Remapping all available system devices of platform to a easy to reach location
|
Description=Remapping all available system devices of platform to a easy to reach location
|
||||||
Before=multi-user.target
|
After=local-fs.target
|
||||||
Before=shutdown.target
|
Before=osmo-bts-oc2g.service
|
||||||
Before=watchdog.service
|
|
||||||
After=checkflash.service
|
After=checkflash.service
|
||||||
Wants=checkflash.service
|
Wants=checkflash.service
|
||||||
After=time-sync.target
|
After=time-sync.target
|
||||||
Conflicts=shutdown.target
|
Conflicts=shutdown.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=forking
|
Type=oneshot
|
||||||
Restart=no
|
RuntimeDirectory=oc2g
|
||||||
TimeoutSec=5min
|
ExecStart=/bin/ln -f -s /run/oc2g /var/oc2g
|
||||||
IgnoreSIGPIPE=no
|
ExecStart=/usr/bin/oc2g-sysdev-remap
|
||||||
KillMode=process
|
|
||||||
GuessMainPID=no
|
|
||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
ExecStart=/etc/init.d/oc2g-sysdev-remap start
|
|
||||||
ExecStop=/etc/init.d/oc2g-sysdev-remap stop
|
[Install]
|
||||||
|
WantedBy=multi-user.target oc2gbts-mgr.service
|
||||||
|
|
|
@ -2,15 +2,18 @@ DESCRITOPN = "Remap all available system devices of OC-2G platform as symbolic l
|
||||||
LICENSE = "BSD"
|
LICENSE = "BSD"
|
||||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb"
|
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb"
|
||||||
|
|
||||||
inherit update-rc.d
|
|
||||||
|
|
||||||
SRC_URI = "file://oc2g-sysdev-remap \
|
SRC_URI = "file://oc2g-sysdev-remap \
|
||||||
file://oc2g-sysdev-remap.init \
|
file://mnt-rom-factory.automount \
|
||||||
|
file://mnt-rom-factory.mount \
|
||||||
|
file://mnt-rom-user.automount \
|
||||||
|
file://mnt-rom-user.mount \
|
||||||
|
file://mnt-storage.automount \
|
||||||
|
file://mnt-storage.mount \
|
||||||
file://oc2g-sysdev-remap.service"
|
file://oc2g-sysdev-remap.service"
|
||||||
|
|
||||||
S = "${WORKDIR}"
|
S = "${WORKDIR}"
|
||||||
|
|
||||||
inherit gitver-repo
|
inherit gitver-repo systemd
|
||||||
|
|
||||||
REPODIR = "${THISDIR}"
|
REPODIR = "${THISDIR}"
|
||||||
REPOFILE = "oc2g-sysdev-remap_1.0.bb"
|
REPOFILE = "oc2g-sysdev-remap_1.0.bb"
|
||||||
|
@ -22,31 +25,24 @@ PR := "${PR}.${REPOGITFN}"
|
||||||
|
|
||||||
RDEPENDS_${PN} += "backup-scripts"
|
RDEPENDS_${PN} += "backup-scripts"
|
||||||
|
|
||||||
|
SYSTEMD_PACKAGES = "${PN}"
|
||||||
|
SYSTEMD_AUTO_ENABLE_${PN}="enable"
|
||||||
|
SYSTEMD_SERVICE_${PN} = "oc2g-sysdev-remap.service mnt-rom-factory.automount mnt-rom-factory.mount mnt-rom-user.automount mnt-rom-user.mount mnt-storage.automount mnt-storage.mount"
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
install -d ${D}${sysconfdir}
|
|
||||||
install -d ${D}${sysconfdir}/systemd
|
|
||||||
install -d ${D}${sysconfdir}/systemd/system
|
|
||||||
install -d ${D}${sysconfdir}/systemd/system/multi-user.target.wants
|
|
||||||
install -d ${D}${sysconfdir}/init.d
|
|
||||||
install -m 0755 -d ${D}${base_libdir}
|
|
||||||
install -m 0755 -d ${D}${systemd_unitdir}
|
|
||||||
install -m 0755 -d ${D}${systemd_unitdir}/system
|
|
||||||
install -d ${D}${bindir}
|
install -d ${D}${bindir}
|
||||||
install -d ${D}/var/volatile/oc2g
|
install -d ${D}/${systemd_system_unitdir}
|
||||||
ln -sf volatile/oc2g ${D}/var/oc2g
|
|
||||||
install -m 0755 ${S}/oc2g-sysdev-remap ${D}${bindir}/oc2g-sysdev-remap
|
install -m 0755 ${S}/oc2g-sysdev-remap ${D}${bindir}/oc2g-sysdev-remap
|
||||||
install -m 0755 ${S}/oc2g-sysdev-remap.init ${D}${sysconfdir}/init.d/oc2g-sysdev-remap
|
install -m 0644 ${S}/oc2g-sysdev-remap.service ${D}${systemd_system_unitdir}/
|
||||||
install -m 0644 ${S}/oc2g-sysdev-remap.service ${D}${systemd_unitdir}/system/oc2g-sysdev-remap.service
|
install -m 0644 ${S}/mnt-rom-factory.automount ${D}${systemd_system_unitdir}/
|
||||||
ln -sf ${systemd_unitdir}/system/oc2g-sysdev-remap.service ${D}${sysconfdir}/systemd/system/multi-user.target.wants/oc2g-sysdev-remap.service
|
install -m 0644 ${S}/mnt-rom-factory.mount ${D}${systemd_system_unitdir}/
|
||||||
|
install -m 0644 ${S}/mnt-rom-user.automount ${D}${systemd_system_unitdir}/
|
||||||
|
install -m 0644 ${S}/mnt-rom-user.mount ${D}${systemd_system_unitdir}/
|
||||||
|
install -m 0644 ${S}/mnt-storage.automount ${D}${systemd_system_unitdir}/
|
||||||
|
install -m 0644 ${S}/mnt-storage.mount ${D}${systemd_system_unitdir}/
|
||||||
}
|
}
|
||||||
|
|
||||||
FILES_${PN} += "${bindir} \
|
FILES_${PN} += "${bindir} \
|
||||||
${sysconfdir} \
|
${sysconfdir}"
|
||||||
${systemd_unitdir} \
|
|
||||||
${sysconfdir}/init.d \
|
|
||||||
/var/oc2g"
|
|
||||||
|
|
||||||
INSANE_SKIP_${PN} = "arch"
|
INSANE_SKIP_${PN} = "arch"
|
||||||
INITSCRIPT_PACKAGES = "${PN}"
|
|
||||||
INITSCRIPT_NAME_${PN} = "oc2g-sysdev-remap"
|
|
||||||
INITSCRIPT_PARAMS_${PN} = "defaults 21 21"
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||||
|
|
||||||
PV = "0.0.0+git${SRCPV}"
|
PV = "0.0.0+git${SRCPV}"
|
||||||
SRCREV = "0deb9c7e135e9380a6d09e9d2e938a146bb698c8"
|
SRCREV = "0deb9c7e135e9380a6d09e9d2e938a146bb698c8"
|
||||||
SRC_URI = "git://github.com/ago/pps-tools.git"
|
SRC_URI = "git://github.com/ago/pps-tools.git;protocol=https"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ LICENSE = "GPLv2+"
|
||||||
LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=20;md5=f2b40a2eb5162af4c3cb20428e72f921"
|
LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=20;md5=f2b40a2eb5162af4c3cb20428e72f921"
|
||||||
|
|
||||||
SRCREV = "095c1cb55757c1f542370e5ba33de663c5d68ba4"
|
SRCREV = "095c1cb55757c1f542370e5ba33de663c5d68ba4"
|
||||||
SRC_URI = "git://git.sysmocom.de/sysmo-bts/dvnixload;protocol=git;branch=master"
|
SRC_URI = "git://gitea.sysmocom.de/sysmo-bts/dvnixload.git;protocol=https;branch=master"
|
||||||
PV = "v0.2.6+git${SRCPV}"
|
PV = "v0.2.6+git${SRCPV}"
|
||||||
PR = "r1"
|
PR = "r1"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
|
@ -2,7 +2,7 @@ DESCRIPTION = "sysmoBTS Layer1 API header files"
|
||||||
SECTION = "kernel"
|
SECTION = "kernel"
|
||||||
LICENSE = "CLOSED"
|
LICENSE = "CLOSED"
|
||||||
|
|
||||||
SRC_URI = "git://git.sysmocom.de/sysmo-bts/layer1-api.git;protocol=git;branch=master"
|
SRC_URI = "git://gitea.sysmocom.de/sysmo-bts/layer1-api.git;protocol=https;branch=master"
|
||||||
SRCREV = "superfemto_v2.4"
|
SRCREV = "superfemto_v2.4"
|
||||||
PV = "2.4"
|
PV = "2.4"
|
||||||
PR = "r1"
|
PR = "r1"
|
||||||
|
|
|
@ -2,7 +2,7 @@ DESCRIPTION = "sysmoBTS Layer1 API header files"
|
||||||
SECTION = "kernel"
|
SECTION = "kernel"
|
||||||
LICENSE = "CLOSED"
|
LICENSE = "CLOSED"
|
||||||
|
|
||||||
SRC_URI = "git://git.sysmocom.de/sysmo-bts/layer1-api.git;protocol=git;branch=master"
|
SRC_URI = "git://gitea.sysmocom.de/sysmo-bts/layer1-api.git;protocol=https;branch=master"
|
||||||
SRCREV = "84e0cf46511f256ef84c0211f3f39a642acceb33"
|
SRCREV = "84e0cf46511f256ef84c0211f3f39a642acceb33"
|
||||||
SRCREV_sysmobts-v2 = "7f0d5697b85340877b127a25e0c8f2a5f5fe66d7"
|
SRCREV_sysmobts-v2 = "7f0d5697b85340877b127a25e0c8f2a5f5fe66d7"
|
||||||
PV = "${SRCREV}+git${SRCPV}"
|
PV = "${SRCREV}+git${SRCPV}"
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
# OS#4062, OS#5079: When building with sysmobts toolchain we hit a TLS compiler
|
||||||
|
# bug (osmo-bts-symo calling osmo_str_tolower() which uses "static __thread char
|
||||||
|
# capsbuf"). As a result, the only option would be to use -O0 when building
|
||||||
|
# libosmocore. In order to avoid that, we take advantage of the fact that no
|
||||||
|
# libosmocore multi-thread process is expected to run there and simply drop all
|
||||||
|
# the "__thread" references when building for sysmobts. That's done as a
|
||||||
|
# machine-specific bbappend in meta-sysmocom-bsp.
|
||||||
|
do_compile_prepend() {
|
||||||
|
grep -r -l "__thread" "${S}/src/" "${S}/include/" | xargs sed -i "s/__thread//g"
|
||||||
|
}
|
|
@ -2,13 +2,13 @@ DESCRIPTION = "sysmocom OsmoBTS"
|
||||||
LICENSE = "AGPLv3"
|
LICENSE = "AGPLv3"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
|
||||||
|
|
||||||
SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;destsuffix=git;nobranch=1"
|
SRCREV = "1.7.2"
|
||||||
SRCREV = "d785da59431007a372768403271b4108d8b4201e"
|
SRC_URI = "git://gerrit.osmocom.org/osmo-bts;protocol=https;destsuffix=git;tag=${SRCREV};nobranch=1"
|
||||||
PV = "1.0.0+git${SRCPV}"
|
PV = "${SRCREV}+git${SRCPV}"
|
||||||
PR = "r1.${META_TELEPHONY_OSMO_INC}"
|
PR = "r0.${META_TELEPHONY_OSMO_INC}"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
DEPENDS = "libosmocore libosmo-abis femtobts-api gpsd"
|
DEPENDS = "libosmocore libosmo-abis libosmo-netif femtobts-api gpsd"
|
||||||
DEPENDS_append_sysmobts-v2 = " femtobts-api"
|
DEPENDS_append_sysmobts-v2 = " femtobts-api"
|
||||||
DEPENDS_append_sysmobts2100 = " lc15-firmware"
|
DEPENDS_append_sysmobts2100 = " lc15-firmware"
|
||||||
DEPENDS_append_oc2g = " oc2g-firmware systemd"
|
DEPENDS_append_oc2g = " oc2g-firmware systemd"
|
||||||
|
@ -32,15 +32,24 @@ PACKAGECONFIG ??= "\
|
||||||
"
|
"
|
||||||
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
|
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
|
||||||
|
|
||||||
# Latest osmo-bts-oc2g still uses osmo-bts.cfg as file name and config/systemd
|
# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340):
|
||||||
# files are not installed through autotools yet.
|
do_install_append_sysmobts-v2() {
|
||||||
|
sed -i '/^StateDirectory=/d' ${D}${systemd_system_unitdir}/osmo-bts-sysmo.service
|
||||||
|
sed -i '/^WorkingDirectory=/d' ${D}${systemd_system_unitdir}/osmo-bts-sysmo.service
|
||||||
|
sed -i '/^StateDirectory=/d' ${D}${systemd_system_unitdir}/sysmobts-mgr.service
|
||||||
|
sed -i '/^WorkingDirectory=/d' ${D}${systemd_system_unitdir}/sysmobts-mgr.service
|
||||||
|
}
|
||||||
|
do_install_append_sysmobts2100() {
|
||||||
|
sed -i '/^StateDirectory=/d' ${D}${systemd_system_unitdir}/osmo-bts-lc15.service
|
||||||
|
sed -i '/^WorkingDirectory=/d' ${D}${systemd_system_unitdir}/osmo-bts-lc15.service
|
||||||
|
sed -i '/^StateDirectory=/d' ${D}${systemd_system_unitdir}/lc15bts-mgr.service
|
||||||
|
sed -i '/^WorkingDirectory=/d' ${D}${systemd_system_unitdir}/lc15bts-mgr.service
|
||||||
|
}
|
||||||
do_install_append_oc2g() {
|
do_install_append_oc2g() {
|
||||||
install -m 0660 ${S}/doc/examples/oc2g/osmo-bts.cfg ${D}${sysconfdir}/osmocom
|
sed -i '/^StateDirectory=/d' ${D}${systemd_system_unitdir}/osmo-bts-oc2g.service
|
||||||
|
sed -i '/^WorkingDirectory=/d' ${D}${systemd_system_unitdir}/osmo-bts-oc2g.service
|
||||||
# Install systemd and enable on sysinit
|
sed -i '/^StateDirectory=/d' ${D}${systemd_system_unitdir}/oc2gbts-mgr.service
|
||||||
install -m 0644 ${S}/contrib/systemd/oc2gbts-mgr.service ${D}${systemd_system_unitdir}/oc2gbts-mgr.service
|
sed -i '/^WorkingDirectory=/d' ${D}${systemd_system_unitdir}/oc2gbts-mgr.service
|
||||||
install -m 0660 ${S}/doc/examples/oc2g/oc2gbts-mgr.cfg ${D}${sysconfdir}/osmocom/
|
|
||||||
install -m 0644 ${S}/contrib/systemd/osmo-bts-oc2g.service ${D}${systemd_system_unitdir}/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SYSTEMD_PACKAGES = "${PN} osmo-bts-virtual"
|
SYSTEMD_PACKAGES = "${PN} osmo-bts-virtual"
|
||||||
|
@ -56,7 +65,7 @@ SYSTEMD_SERVICE_${PN}_append_oc2g = " oc2gbts-mgr.service osmo-bts-oc2g.service"
|
||||||
|
|
||||||
CONFFILES_${PN}_append_sysmobts-v2 = " ${sysconfdir}/osmocom/sysmobts-mgr.cfg ${sysconfdir}/osmocom/osmo-bts-sysmo.cfg"
|
CONFFILES_${PN}_append_sysmobts-v2 = " ${sysconfdir}/osmocom/sysmobts-mgr.cfg ${sysconfdir}/osmocom/osmo-bts-sysmo.cfg"
|
||||||
CONFFILES_${PN}_append_sysmobts2100 = " ${sysconfdir}/osmocom/lc15bts-mgr.cfg ${sysconfdir}/osmocom/osmo-bts-lc15.cfg"
|
CONFFILES_${PN}_append_sysmobts2100 = " ${sysconfdir}/osmocom/lc15bts-mgr.cfg ${sysconfdir}/osmocom/osmo-bts-lc15.cfg"
|
||||||
CONFFILES_${PN}_append_oc2g = " ${sysconfdir}/oc2gbts-mgr.cfg ${sysconfdir}/osmocom/osmo-bts.cfg"
|
CONFFILES_${PN}_append_oc2g = " ${sysconfdir}/oc2gbts-mgr.cfg ${sysconfdir}/osmocom/osmo-bts-oc2g.cfg"
|
||||||
|
|
||||||
# somehow it seems not posible to use _append constructs on PACKAGES
|
# somehow it seems not posible to use _append constructs on PACKAGES
|
||||||
#PACKAGES_append_sysmobts-v2 = " osmo-bts-remote sysmobts-calib sysmobts-util"
|
#PACKAGES_append_sysmobts-v2 = " osmo-bts-remote sysmobts-calib sysmobts-util"
|
||||||
|
|
|
@ -2,9 +2,9 @@ DESCRIPTION = "Osmocom PCU for sysmoBTS"
|
||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||||
|
|
||||||
SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=master"
|
SRCREV = "1.4.0"
|
||||||
SRCREV = "99278b105018af24cc5a28673ffa960e933f3979"
|
SRC_URI = "git://gerrit.osmocom.org/osmo-pcu;protocol=https;branch=master;nobranch=1"
|
||||||
PV = "0.6.0+git${SRCPV}"
|
PV = "${SRCREV}+git${SRCPV}"
|
||||||
PR = "r0.${META_TELEPHONY_OSMO_INC}"
|
PR = "r0.${META_TELEPHONY_OSMO_INC}"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ DEPENDS = "libosmocore osmo-bts"
|
||||||
DEPENDS_append_sysmobts-v2 = " femtobts-api"
|
DEPENDS_append_sysmobts-v2 = " femtobts-api"
|
||||||
DEPENDS_append_litecell15 = " lc15-firmware"
|
DEPENDS_append_litecell15 = " lc15-firmware"
|
||||||
DEPENDS_append_sysmobts2100 = " lc15-firmware"
|
DEPENDS_append_sysmobts2100 = " lc15-firmware"
|
||||||
|
DEPENDS_append_oc2g = " oc2g-firmware"
|
||||||
|
|
||||||
# This implements PCU Interface v8 (GPRS RSSI)
|
# This implements PCU Interface v8 (GPRS RSSI)
|
||||||
RDEPENDS_${PN} = "osmo-bts (>= 0.8.0)"
|
RDEPENDS_${PN} = "osmo-bts (>= 0.8.0)"
|
||||||
|
@ -19,6 +20,7 @@ RDEPENDS_${PN} = "osmo-bts (>= 0.8.0)"
|
||||||
EXTRA_OECONF_sysmobts-v2 += "--enable-sysmocom-dsp"
|
EXTRA_OECONF_sysmobts-v2 += "--enable-sysmocom-dsp"
|
||||||
EXTRA_OECONF_litecell15 += "--enable-lc15bts-phy"
|
EXTRA_OECONF_litecell15 += "--enable-lc15bts-phy"
|
||||||
EXTRA_OECONF_sysmobts2100 += "--enable-lc15bts-phy"
|
EXTRA_OECONF_sysmobts2100 += "--enable-lc15bts-phy"
|
||||||
|
EXTRA_OECONF_oc2g += "--enable-oc2gbts-phy"
|
||||||
|
|
||||||
inherit autotools pkgconfig systemd
|
inherit autotools pkgconfig systemd
|
||||||
|
|
||||||
|
@ -27,6 +29,12 @@ PACKAGECONFIG ??= "\
|
||||||
"
|
"
|
||||||
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
|
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
|
||||||
|
|
||||||
|
do_install_append() {
|
||||||
|
# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340):
|
||||||
|
sed -i '/^StateDirectory=/d' ${D}${systemd_system_unitdir}/osmo-pcu.service
|
||||||
|
sed -i '/^WorkingDirectory=/d' ${D}${systemd_system_unitdir}/osmo-pcu.service
|
||||||
|
}
|
||||||
|
|
||||||
SYSTEMD_PACKAGES = "${PN}"
|
SYSTEMD_PACKAGES = "${PN}"
|
||||||
SYSTEMD_AUTO_ENABLE_${PN}="enable"
|
SYSTEMD_AUTO_ENABLE_${PN}="enable"
|
||||||
SYSTEMD_SERVICE_${PN} = "osmo-pcu.service"
|
SYSTEMD_SERVICE_${PN} = "osmo-pcu.service"
|
||||||
|
|
|
@ -6,7 +6,7 @@ PRIORITY = "optional"
|
||||||
LICENSE = "GPLv2+"
|
LICENSE = "GPLv2+"
|
||||||
LIC_FILES_CHKSUM = "file://ubl.c;beginline=1;endline=22;md5=806283bb3c475d9082e41f09020373ff"
|
LIC_FILES_CHKSUM = "file://ubl.c;beginline=1;endline=22;md5=806283bb3c475d9082e41f09020373ff"
|
||||||
|
|
||||||
SRC_URI = "git://git.sysmocom.de/sysmo-bts/ubl;protocol=git;branch=master"
|
SRC_URI = "git://gitea.sysmocom.de/sysmo-bts/ubl.git;protocol=https;branch=master"
|
||||||
SRCREV = "77aac3693b45df7154ada64341fd67e41f990f22"
|
SRCREV = "77aac3693b45df7154ada64341fd67e41f990f22"
|
||||||
PV = "v0.2.11+git${SRCPV}"
|
PV = "v0.2.11+git${SRCPV}"
|
||||||
PR = "r3"
|
PR = "r3"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
SRC_URI = "git://git.sysmocom.de/sysmo-bts/u-boot;branch=tracking/upstream-next;protocol=git"
|
SRC_URI = "git://gitea.sysmocom.de/sysmo-bts/u-boot.git;branch=tracking/upstream-next;protocol=https"
|
||||||
SRCREV = "64b07727fbb268bd19bacfed6711bdb060effcfa"
|
SRCREV = "64b07727fbb268bd19bacfed6711bdb060effcfa"
|
||||||
PV = "v2017.03+git${SRCPV}"
|
PV = "v2017.03+git${SRCPV}"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
Loading…
Reference in New Issue