Merge commit '7e54997fbe9903d9c734cbea5e37bea71cb2fb7b' into dora
This commit is contained in:
commit
3c9ac429ac
|
@ -1,6 +1,7 @@
|
||||||
SOC_FAMILY = "ti33x"
|
SOC_FAMILY = "ti33x"
|
||||||
require conf/machine/include/soc-family.inc
|
require conf/machine/include/soc-family.inc
|
||||||
|
|
||||||
|
DEFAULTTUNE ?= "cortexa8hf-neon"
|
||||||
require conf/machine/include/tune-cortexa8.inc
|
require conf/machine/include/tune-cortexa8.inc
|
||||||
|
|
||||||
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
|
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
|
||||||
|
@ -31,5 +32,5 @@ UBOOT_LOADADDRESS = "0x80008000"
|
||||||
UBI_VOLNAME = "rootfs"
|
UBI_VOLNAME = "rootfs"
|
||||||
|
|
||||||
# List common SoC features, may need to add touchscreen for specific machines
|
# List common SoC features, may need to add touchscreen for specific machines
|
||||||
MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"
|
MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet"
|
||||||
|
|
||||||
|
|
|
@ -33,10 +33,8 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
|
||||||
PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
|
PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
|
||||||
KERNEL_IMAGETYPE = "uImage"
|
KERNEL_IMAGETYPE = "uImage"
|
||||||
|
|
||||||
# OE passes CC/CFLAGS and barebox adds incompatible things
|
PREFERRED_PROVIDER_virtual/bootloader = "barebox-sysmocom-odu"
|
||||||
# temporarily disable it
|
EXTRA_IMAGEDEPENDS += "barebox-sysmocom-odu"
|
||||||
#PREFERRED_PROVIDER_virtual/bootloader = "barebox-sysmocom-odu"
|
|
||||||
#EXTRA_IMAGEDEPENDS += "barebox-sysmocom-odu"
|
|
||||||
|
|
||||||
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
|
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
|
||||||
kernel usb2514 \
|
kernel usb2514 \
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
etc/hostname
|
||||||
|
etc/ifplugd.sh
|
||||||
|
etc/network/interfaces
|
||||||
|
etc/openvpn
|
||||||
|
etc/opkg/sysmocom-config.conf
|
||||||
|
etc/osmocom/osmo-bsc-mgcp.cfg
|
||||||
|
etc/osmocom/osmo-bsc.cfg
|
||||||
|
etc/osmocom/osmo-bts.cfg
|
||||||
|
etc/osmocom/osmo-nitb.cfg
|
||||||
|
etc/osmocom/osmo-pcu.cfg
|
||||||
|
etc/osmocom/osmo-sgsn.cfg
|
||||||
|
etc/systemd/system/multi-user.target.wants/osmo-nitb.service
|
||||||
|
etc/systemd/system/multi-user.target.wants/osmo-bsc.service
|
||||||
|
etc/systemd/system/multi-user.target.wants/osmo-sgsn.service
|
||||||
|
etc/ggsn.conf
|
||||||
|
etc/default
|
||||||
|
var/lib/osmocom/hlr.sqlite3
|
||||||
|
etc/lcr
|
||||||
|
etc/udhcpd.conf
|
||||||
|
etc/sysmocom/backup.d
|
|
@ -3,28 +3,7 @@
|
||||||
|
|
||||||
# Make sure to look at sysmocom-restore to check if the file would
|
# Make sure to look at sysmocom-restore to check if the file would
|
||||||
# be restored right. Currently only some dirs get restored.
|
# be restored right. Currently only some dirs get restored.
|
||||||
FILES="\
|
FILES="etc/sysmocom/backup.d"
|
||||||
etc/hostname \
|
|
||||||
etc/ifplugd.sh \
|
|
||||||
etc/network/interfaces \
|
|
||||||
etc/openvpn \
|
|
||||||
etc/opkg/sysmocom-config.conf \
|
|
||||||
etc/osmocom/osmo-bsc-mgcp.cfg \
|
|
||||||
etc/osmocom/osmo-bsc.cfg \
|
|
||||||
etc/osmocom/osmo-bts.cfg \
|
|
||||||
etc/osmocom/osmo-nitb.cfg \
|
|
||||||
etc/osmocom/osmo-pcu.cfg \
|
|
||||||
etc/osmocom/osmo-sgsn.cfg \
|
|
||||||
etc/systemd/system/multi-user.target.wants/osmo-nitb.service \
|
|
||||||
etc/systemd/system/multi-user.target.wants/osmo-bsc.service \
|
|
||||||
etc/systemd/system/multi-user.target.wants/osmo-sgsn.service \
|
|
||||||
etc/ggsn.conf \
|
|
||||||
etc/default \
|
|
||||||
var/lib/osmocom/hlr.sqlite3 \
|
|
||||||
etc/lcr \
|
|
||||||
etc/udhcpd.conf \
|
|
||||||
etc/sysmocom/backup.d \
|
|
||||||
"
|
|
||||||
|
|
||||||
# Pick some extra files
|
# Pick some extra files
|
||||||
if [ -e /etc/sysmocom/backup.d/ ]; then
|
if [ -e /etc/sysmocom/backup.d/ ]; then
|
||||||
|
@ -67,7 +46,10 @@ do_backup_files() {
|
||||||
# 4. Add the more information
|
# 4. Add the more information
|
||||||
tar -rf $BACKUP_FILE --transform='s,^,info/,' -C $NAME installed_packages mac_addr
|
tar -rf $BACKUP_FILE --transform='s,^,info/,' -C $NAME installed_packages mac_addr
|
||||||
|
|
||||||
# 5.
|
# 5. Create stable link
|
||||||
|
ln -sf $BACKUP_FILE /home/root/sysmocom-backup.tar
|
||||||
|
|
||||||
|
# 6.
|
||||||
echo "The backup was stored to $BACKUP_FILE"
|
echo "The backup was stored to $BACKUP_FILE"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,11 +3,22 @@ LICENSE = "GPLv3+"
|
||||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||||
PR = "r12"
|
PR = "r12"
|
||||||
|
|
||||||
SRC_URI = "file://sysmocom-backup file://sysmocom-restore"
|
SRC_URI = " \
|
||||||
|
file://sysmocom-backup \
|
||||||
|
file://sysmocom-restore \
|
||||||
|
file://default.files \
|
||||||
|
"
|
||||||
RDEPENDS_${PN} = "tar"
|
RDEPENDS_${PN} = "tar"
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
install -d ${D}${sbindir}
|
install -d ${D}${sbindir}
|
||||||
install -m 0755 ${WORKDIR}/sysmocom-backup ${D}${sbindir}/
|
install -m 0755 ${WORKDIR}/sysmocom-backup ${D}${sbindir}/
|
||||||
install -m 0755 ${WORKDIR}/sysmocom-restore ${D}${sbindir}/
|
install -m 0755 ${WORKDIR}/sysmocom-restore ${D}${sbindir}/
|
||||||
|
|
||||||
|
install -d ${D}${sysconfdir}/sysmocom/backup.d
|
||||||
|
install -m 0644 ${WORKDIR}/default.files ${D}${sysconfdir}/sysmocom/backup.d/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PACKAGES =+ "${PN}-default"
|
||||||
|
|
||||||
|
FILES_${PN}-default = "${sysconfdir}/sysmocom/backup.d/"
|
||||||
|
|
|
@ -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 = "r7"
|
PR = "r9"
|
||||||
|
|
||||||
RDEPENDS_${PN} = "\
|
RDEPENDS_${PN} = "\
|
||||||
lmsensors-scripts \
|
lmsensors-scripts \
|
||||||
|
@ -15,4 +15,5 @@ RDEPENDS_${PN} = "\
|
||||||
wget \
|
wget \
|
||||||
ca-cacert-rootcert \
|
ca-cacert-rootcert \
|
||||||
sysmocom-backup \
|
sysmocom-backup \
|
||||||
|
sysmocom-backup-default \
|
||||||
"
|
"
|
||||||
|
|
|
@ -15,14 +15,17 @@ EXTRA_OEMAKE = "ARCH=arm CROSS_COMPILE=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREF
|
||||||
|
|
||||||
do_configure_prepend() {
|
do_configure_prepend() {
|
||||||
cp ${WORKDIR}/defconfig ${S}/.config
|
cp ${WORKDIR}/defconfig ${S}/.config
|
||||||
|
# do not compile tools when using KERNEL_CC/KERNEL_LD
|
||||||
|
echo CONFIG_BAREBOXENV_TARGET=n >> ${S}/.config
|
||||||
|
echo CONFIG_BAREBOXCRC32_TARGET=n >> ${S}/.config
|
||||||
|
echo CONFIG_KERNEL_INSTALL_TARGET=n >> ${S}/.config
|
||||||
|
echo CONFIG_IMD_TARGET=n >> ${S}/.config
|
||||||
oe_runmake oldconfig
|
oe_runmake oldconfig
|
||||||
}
|
}
|
||||||
|
|
||||||
do_compile () {
|
do_compile () {
|
||||||
unset LDFLAGS
|
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
|
||||||
unset CFLAGS
|
oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
|
||||||
unset CPPFLAGS
|
|
||||||
oe_runmake CC="$CC"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
do_deploy () {
|
do_deploy () {
|
||||||
|
|
|
@ -4,8 +4,8 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
|
||||||
|
|
||||||
SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=zecke/sysmobts-calibration;name=osmobts;destsuffix=git \
|
SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=zecke/sysmobts-calibration;name=osmobts;destsuffix=git \
|
||||||
git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
|
git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
|
||||||
SRCREV_osmobts = "83a549a153a30b8bc7122e0ca2f99ea6fcb1ea44"
|
SRCREV_osmobts = "f869a95f3b81d281405e3fc3026e1d0d53174082"
|
||||||
SRCREV_openbsc = "142d12d829d4207e2fe7dee34b8d82dd89015615"
|
SRCREV_openbsc = "57ee78078905c7499bd4e6857f8981d22badfcac"
|
||||||
PV = "0.4.3+git${SRCPV}"
|
PV = "0.4.3+git${SRCPV}"
|
||||||
PR = "r17.${META_TELEPHONY_OSMO_INC}"
|
PR = "r17.${META_TELEPHONY_OSMO_INC}"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
|
@ -3,7 +3,7 @@ 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"
|
SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=master"
|
||||||
SRCREV = "0a0b5dcb324d3652f55541855426c91f0c9d9536"
|
SRCREV = "67728acc7a90dbf076eb179d6e3e119a4197896a"
|
||||||
PV = "0.4+git${SRCPV}"
|
PV = "0.4+git${SRCPV}"
|
||||||
PR = "r2.${META_TELEPHONY_OSMO_INC}"
|
PR = "r2.${META_TELEPHONY_OSMO_INC}"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
Loading…
Reference in New Issue