Compare commits
33 Commits
Author | SHA1 | Date |
---|---|---|
Pau Espin | 819c17e138 | |
Oliver Smith | 7aca9c9f1e | |
Harald Welte | 7c0b7a9997 | |
Harald Welte | f02bca3f9f | |
Harald Welte | e70782692b | |
Pau Espin Pedrol | bca318fdac | |
Pau Espin | abf8de0bcf | |
Harald Welte | e158378a69 | |
Pau Espin | 6c68a99f45 | |
Daniel Willmann | 861c37e332 | |
Daniel Willmann | a3e4df7d16 | |
Daniel Willmann | 618f660026 | |
Omar Ramadan | 0ef8b7a9f6 | |
Pau Espin | a0e27de3bd | |
Pau Espin | 20eea59978 | |
Pau Espin | d6d0c3c644 | |
Pau Espin | e72638bdc7 | |
Pau Espin | 8030258191 | |
Pau Espin | eb2b25a433 | |
Pau Espin | bac9e0e393 | |
Pau Espin | ea7ed240d2 | |
Pau Espin | e3cbf53138 | |
Pau Espin | bf116e5a61 | |
Holger Hans Peter Freyther | 10236ec492 | |
Holger Hans Peter Freyther | 30fac6acb8 | |
Holger Hans Peter Freyther | d413b7be38 | |
Holger Hans Peter Freyther | ccf6ece826 | |
Holger Hans Peter Freyther | 06d37a5847 | |
Holger Hans Peter Freyther | a5ac1374cd | |
Holger Hans Peter Freyther | b8c9e10c12 | |
Pau Espin | 6c0a4e0af0 | |
Holger Hans Peter Freyther | 3ddf399a96 | |
Holger Hans Peter Freyther | 36df2b58cd |
42
Makefile
42
Makefile
|
@ -24,19 +24,26 @@ endif
|
|||
# Variables
|
||||
SYSMOCOM_RELEASE=201705
|
||||
POKY_RELEASE=pyro
|
||||
REPOS=poky meta-telephony meta-sysmocom-bsp meta-qt5 meta-sysmocom-bsp meta-smalltalk
|
||||
MACHINES=sysmobts sysmobts2100 sysmocom-apu2 sysmocom-alix
|
||||
REPOS=poky meta-telephony meta-qt5 meta-sysmocom-bsp meta-smalltalk
|
||||
MACHINES=sysmobts sysmobts2100 sysmocom-apu2 sysmocom-alix oc2g
|
||||
FEED_NAME=$(SYSMOCOM_RELEASE)-testing
|
||||
|
||||
# The default targets to pick depending on machine
|
||||
BUILD_TARGET_sysmobts = "meta-toolchain-osmo task-sysmocom-feed sysmocom-core-image sysmocom-nitb-rauc-image image-rauc-rescue-initramfs image-rauc-slot-initramfs image-rauc-ubi"
|
||||
BUILD_TARGET_sysmobts2100 = "meta-toolchain-osmo task-sysmocom-feed sysmocom-core-image"
|
||||
BUILD_TARGET_sysmocom-apu2 = "core-image-minimal-initramfs meta-toolchain-osmo task-sysmocom-feed sysmocom-core-image core-image-minimal-initramfs"
|
||||
BUILD_TARGET_sysmocom-alix = "core-image-minimal-initramfs meta-toolchain-osmo task-sysmocom-feed sysmocom-core-image core-image-minimal-initramfs"
|
||||
BUILD_TARGET_sysmobts = meta-toolchain-osmo task-sysmocom-feed sysmocom-core-image sysmocom-nitb-image sysmocom-voice-sip-image sysmocom-core-rauc-image sysmocom-nitb-rauc-image image-rauc-rescue-initramfs image-rauc-slot-initramfs image-rauc-ubi
|
||||
BUILD_TARGET_sysmobts2100 = meta-toolchain-osmo task-sysmocom-feed sysmocom-core-image sysmocom-nitb-image
|
||||
BUILD_TARGET_oc2g = meta-toolchain-osmo task-sysmocom-feed sysmocom-core-image sysmocom-nitb-image
|
||||
BUILD_TARGET_sysmocom-apu2 = core-image-minimal-initramfs meta-toolchain-osmo task-sysmocom-feed sysmocom-core-image sysmocom-nitb-image core-image-minimal-initramfs
|
||||
BUILD_TARGET_sysmocom-alix = core-image-minimal-initramfs meta-toolchain-osmo task-sysmocom-feed sysmocom-core-image sysmocom-nitb-image core-image-minimal-initramfs
|
||||
|
||||
# Pick the one depending on $@. Not sure if .SECONDEXPANSION is more
|
||||
# approiate here or not.
|
||||
BUILD_TARGETS="$(BUILD_TARGET_$(CUR_MACHINE))"
|
||||
BUILD_TARGETS=$(BUILD_TARGET_$(CUR_MACHINE))
|
||||
|
||||
GIT_BRANCH_POKY = "$(POKY_RELEASE)"
|
||||
GIT_BRANCH_SYSMOCOM_BSP = "$(SYSMOCOM_RELEASE)"
|
||||
GIT_BRANCH_TELEPHONY = "$(SYSMOCOM_RELEASE)"
|
||||
GIT_BRANCH_SMALLTALK = "$(SYSMOCOM_RELEASE)"
|
||||
GIT_BRANCH_QT5 = "$(SYSMOCOM_RELEASE)"
|
||||
|
||||
#
|
||||
usage:
|
||||
|
@ -66,8 +73,9 @@ help:
|
|||
@echo " make-server-structure - Create directories for machine/release"
|
||||
@echo "Available variables:"
|
||||
@echo " V=1 - Enable verbose command output"
|
||||
@echo " SYSMOCOM_RELEASE=name - Pick branch during clone"
|
||||
@echo " POKY_RELEASE=name - Pick branch during clone"
|
||||
@echo " SYSMOCOM_RELEASE=name - Pick release branch during clone"
|
||||
@echo " POKY_RELEASE=name - Pick release branch during clone"
|
||||
@echo " GIT_BRANCH_* - Pick branch for a specific repository"
|
||||
|
||||
# Fetch/update all repos... Expand REPOS and append -update to the rule
|
||||
# e.g. poky-update meta-telephony-update
|
||||
|
@ -85,15 +93,15 @@ git:
|
|||
|
||||
## Clone repositories. The other option is by variable something like BRNACH_poky, REPO_poky
|
||||
git/poky: | git
|
||||
$(V)cd git && git clone --branch=$(POKY_RELEASE) --depth=1 git://git.yoctoproject.org/poky
|
||||
$(V)cd git && git clone --branch=$(GIT_BRANCH_POKY) --depth=1 https://gitea.sysmocom.de/sysmo-bts/generic-poky poky
|
||||
git/meta-sysmocom-bsp: | git
|
||||
cd git && git clone --branch=$(SYSMOCOM_RELEASE) git://git.sysmocom.de/poky/meta-sysmocom-bsp
|
||||
cd git && git clone --branch=$(GIT_BRANCH_SYSMOCOM_BSP) https://gitea.sysmocom.de/sysmo-bts/meta-sysmocom-bsp
|
||||
git/meta-telephony: | git
|
||||
cd git && git clone --branch=$(SYSMOCOM_RELEASE) git://git.osmocom.org/meta-telephony
|
||||
cd git && git clone --branch=$(GIT_BRANCH_TELEPHONY) https://gerrit.osmocom.org/meta-telephony
|
||||
git/meta-smalltalk: | git
|
||||
cd git && git clone --branch=$(SYSMOCOM_RELEASE) git://github.com/sysmocom/meta-smalltalk
|
||||
cd git && git clone --branch=$(GIT_BRANCH_SMALLTALK) https://github.com/sysmocom/meta-smalltalk
|
||||
git/meta-qt5: | git
|
||||
cd git && git clone --branch=$(SYSMOCOM_RELEASE) git://github.com/sysmocom/meta-qt5
|
||||
cd git && git clone --branch=$(GIT_BRANCH_QT5) https://github.com/sysmocom/meta-qt5
|
||||
|
||||
## Create a build directory, e.g. build.sysmobts
|
||||
## Use Poky to set-up the directory and then customize it. Copy files
|
||||
|
@ -105,10 +113,10 @@ build.%: | git/poky
|
|||
|
||||
# Append entries to conf/local.conf. Common first, machine second... filter
|
||||
$(Q)$(foreach file,$(CFG_FILES), \
|
||||
cat $(file) | sed s,BASE_DIR,$(PWD), >> $@/conf/local.conf;)
|
||||
cat $(file) | sed s,BASE_DIR,${CURDIR}, >> $@/conf/local.conf;)
|
||||
@echo "require conf/distro/include/sysmocom-defaults.conf" >> $@/conf/local.conf
|
||||
|
||||
$(Q)cat cfg/bblayers.conf | sed s,BASE_DIR,$(PWD), > $@/conf/bblayers.conf
|
||||
$(Q)cat cfg/bblayers.conf | sed s,BASE_DIR,${CURDIR}, > $@/conf/bblayers.conf
|
||||
|
||||
|
||||
# generic git pull --rebase rule. Let's assume this is matching poky-update
|
||||
|
@ -123,7 +131,7 @@ build.%: | git/poky
|
|||
|
||||
# Start a build..
|
||||
%-build: | build.$(subst -build,,%) git/poky
|
||||
$(Q)/bin/bash -c "source git/poky/oe-init-build-env build.$(CUR_MACHINE) && bitbake $(BUILD_TARGETS)"
|
||||
$(Q)/bin/bash -c "source git/poky/oe-init-build-env build.$(CUR_MACHINE) && bitbake $(BUILD_TARGETS) && bitbake package-index"
|
||||
|
||||
%-upload: | build.$(subst -upload,,%) git/poky
|
||||
$(Q)cd build.$(CUR_MACHINE) && ../scripts/upload-build.sh $(CUR_MACHINE) $(FEED_NAME)
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
MACHINE = "oc2g"
|
||||
|
||||
# feed
|
||||
PACKAGE_FEED_URIS = "https://autoupdate:eechiesuboot@downloads.sysmocom.de/generic/oc2g/201705/ipk/"
|
||||
|
||||
# HW doesn't have rtc
|
||||
MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
|
||||
|
||||
# Disable DAHDI support in libosmo-abis:
|
||||
PACKAGECONFIG_remove_pn-libosmo-abis = "dahdi"
|
|
@ -1,7 +1,7 @@
|
|||
MACHINE = "sysmobts-v2"
|
||||
|
||||
# feed
|
||||
PACKAGE_FEED_URIS="https://autoupdate:eechiesuboot@downloads.sysmocom.de/generic/sysmobts/201705/ipk/"
|
||||
PACKAGE_FEED_URIS="https://autoupdate:eechiesuboot@feeds.sysmocom.de/generic/sysmobts/201705/ipk/"
|
||||
|
||||
# HW doesn't have rtc
|
||||
MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
|
||||
|
@ -9,3 +9,6 @@ MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
|
|||
# Ignore old kernels
|
||||
BBMASK="recipes-bsp/linux/linux_2.6.39.bb recipes-bsp/linux/linux-sysmocom_3.10.bb"
|
||||
PREFERRED_VERSION_linux-sysmocom = "4.9.14+git%"
|
||||
|
||||
# Disable DAHDI support in libosmo-abis:
|
||||
PACKAGECONFIG_remove_pn-libosmo-abis = "dahdi"
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
MACHINE = "sysmobts2100"
|
||||
|
||||
# feed
|
||||
PACKAGE_FEED_URIS = "https://autoupdate:eechiesuboot@downloads.sysmocom.de/generic/sysmobts2100/201705/ipk/"
|
||||
PACKAGE_FEED_URIS = "https://autoupdate:eechiesuboot@feeds.sysmocom.de/generic/sysmobts2100/201705/ipk/"
|
||||
|
||||
# HW doesn't have rtc
|
||||
MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
|
||||
|
||||
# Disable DAHDI support in libosmo-abis:
|
||||
PACKAGECONFIG_remove_pn-libosmo-abis = "dahdi"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
MACHINE = "sysmocom-alix"
|
||||
PACKAGE_FEED_URIS="https://autoupdate:eechiesuboot@downloads.sysmocom.de/generic/sysmocom-alix/201705/ipk/"
|
||||
PACKAGE_FEED_URIS="https://autoupdate:eechiesuboot@feeds.sysmocom.de/generic/sysmocom-alix/201705/ipk/"
|
||||
|
||||
MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
MACHINE = "sysmocom-apu2"
|
||||
PACKAGE_FEED_URIS="https://autoupdate:eechiesuboot@downloads.sysmocom.de/generic/sysmocom-apu2/201705/ipk/"
|
||||
PACKAGE_FEED_URIS="https://autoupdate:eechiesuboot@feeds.sysmocom.de/generic/sysmocom-apu2/201705/ipk/"
|
||||
MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
|
||||
BBMASK="recipes-bsp/linux/linux_2.6.39.bb recipes-bsp/linux/linux-sysmocom_3.10.bb"
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
DISTRO_FEATURES_append = " iu "
|
|
@ -13,16 +13,29 @@ RELEASE=$2
|
|||
DRYRUN=$3
|
||||
|
||||
if [ "x$DRYRUN" != "x" ]; then
|
||||
ARGS=--dry-run
|
||||
BASE_ARGS="--recursive --delete --links --verbose --dry-run "
|
||||
else
|
||||
BASE_ARGS="--delete -avH"
|
||||
fi
|
||||
|
||||
DIRS=images ipk sdk tools cache-state;
|
||||
DIRS="images ipk sdk tools cache-state sources cache conf"
|
||||
|
||||
for i in $DIRS;
|
||||
do
|
||||
echo "Working on $i"
|
||||
rsync $ARGS --delete -avH \
|
||||
--link-dest=$PWD/web-files/$MACHINE/$RELEASE-testing/$i \
|
||||
if [ ! -e $PWD/web-files/$MACHINE/$RELEASE-testing/$i ]; then
|
||||
echo "Skipping $i, directory doesn't exist"
|
||||
echo ""
|
||||
continue
|
||||
fi
|
||||
|
||||
if [ "x$DRYRUN" != "x" ]; then
|
||||
ARGS="$BASE_ARGS"
|
||||
else
|
||||
ARGS="$BASE_ARGS --link-dest=$PWD/web-files/$MACHINE/$RELEASE-testing/$i"
|
||||
fi
|
||||
|
||||
echo "Checking $i"
|
||||
rsync $ARGS \
|
||||
web-files/$MACHINE/$RELEASE-testing/$i/ \
|
||||
web-files/$MACHINE/$RELEASE/$i/
|
||||
web-files/$MACHINE/$RELEASE/$i/ | egrep -v "sending incre|sent |total"
|
||||
done
|
||||
|
|
|
@ -13,7 +13,7 @@ set -ex
|
|||
|
||||
rsync --delete -avz tmp/deploy/ipk/ sysmocom-downloads:$1/$2/ipk
|
||||
rsync --delete -avz tmp/deploy/images/ sysmocom-downloads:$1/$2/images
|
||||
rsync --delete -avz tmp/deploy/tools/ sysmocom-downloads:$1/$2/tools
|
||||
rsync --delete -avz tmp/deploy/tools/ sysmocom-downloads:$1/$2/tools || true
|
||||
rsync --delete -avz tmp/deploy/sdk/ sysmocom-downloads:$1/$2/sdk
|
||||
rsync --delete -avz tmp/cache/ sysmocom-downloads:$1/$2/cache-state
|
||||
rsync --delete -avz cache/ sysmocom-downloads:$1/$2/cache
|
||||
|
|
Loading…
Reference in New Issue