From 4dce1ae86e4e8abda7c8f17c006d2f8f63b936f7 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Wed, 31 May 2017 14:24:35 +0200 Subject: [PATCH] Change scripts and local.conf for 3g image --- merge-all.sh | 10 +++++----- merge-init.sh | 10 +++++----- meta-yocto/conf/local.conf.sample | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/merge-all.sh b/merge-all.sh index 469602d4d7..11d0d0add3 100755 --- a/merge-all.sh +++ b/merge-all.sh @@ -2,10 +2,10 @@ merge() { - git subtree pull --prefix=$1 rem-$1 master + git subtree pull --prefix=$1 rem-$1 $2 } -merge meta-telephony -merge meta-sysmocom-bsp -merge meta-smalltalk -merge meta-qt5 +merge meta-telephony 3g +merge meta-sysmocom-bsp 3g +merge meta-smalltalk master +merge meta-qt5 master diff --git a/merge-init.sh b/merge-init.sh index b86142a83e..37bca809d5 100755 --- a/merge-init.sh +++ b/merge-init.sh @@ -6,12 +6,12 @@ merge() echo $1 git remote add rem-$1 $2 git fetch rem-$1 - git subtree add --prefix=$1 rem-$1/master + git subtree add --prefix=$1 rem-$1/$3 } -merge meta-telephony git://github.com/sysmocom/meta-telephony.git -merge meta-sysmocom-bsp git://git.sysmocom.de/poky/meta-sysmocom-bsp -merge meta-smalltalk git://github.com/sysmocom/meta-smalltalk.git -merge meta-qt5 git://github.com/sysmocom/meta-qt5.git +merge meta-telephony git://github.com/sysmocom/meta-telephony.git 3g +merge meta-sysmocom-bsp git://git.sysmocom.de/poky/meta-sysmocom-bsp 3g +merge meta-smalltalk git://github.com/sysmocom/meta-smalltalk.git master +merge meta-qt5 git://github.com/sysmocom/meta-qt5.git master diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample index fbc6b59941..f0161b7902 100644 --- a/meta-yocto/conf/local.conf.sample +++ b/meta-yocto/conf/local.conf.sample @@ -49,7 +49,7 @@ #MACHINE ?= "routerstationpro" # # This sets the default machine to be qemux86 if no other machine is selected: -MACHINE ??= "sysmobts-v2" +MACHINE ??= "sysmonitb-ip" # # Where to place downloads @@ -233,7 +233,7 @@ BB_DISKMON_DIRS = "\ # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. CONF_VERSION = "1" -+FEED_URIS="all##https://autoupdate:eechiesuboot@downloads.sysmocom.de/generic/sysmobts/201310/ipk/all armv5te##https://autoupdate:eechiesuboot@downloads.sysmocom.de/generic/sysmobts/201310/ipk/armv5te sysmobts-v2##https://autoupdate:eechiesuboot@downloads.sysmocom.de/generic/sysmobts/201310/ipk/sysmobts_v2" +FEED_URIS="all##https://3g-nitb:ui1Ooch6egho@downloads.sysmocom.de/3g-nitb/201310/ipk/all geode##https://3g-nitb:ui1Ooch6egho@downloads.sysmocom.de/3g-nitb/201310/ipk/geode sysmonitb_ip##https://3g-nitb:ui1Ooch6egho@downloads.sysmocom.de/3g-nitb/201310/ipk/sysmonitb_ip" # Default to systemd DISTRO_FEATURES_append = " systemd "