nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 9e8a386e63 into ece5c6af77

Browse Source
This commit is contained in:
David Bauer 2018-07-14 15:13:43 +00:00 committed by GitHub
commit f6e0b9536a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/common.inc.sh
View File

@ -38,6 +38,10 @@ sysupgrade() {
:
}
other() {
:
}
no_opkg() {
:
}

25
scripts/copy_output.sh
View File

@ -7,6 +7,8 @@ set -e
default_factory_ext='.bin'
default_factory_suffix='-squashfs-factory'
default_other_suffix_openwrt=
default_other_suffix_gluon=
default_sysupgrade_ext='.bin'
default_sysupgrade_suffix='-squashfs-sysupgrade'
@ -16,13 +18,15 @@ aliases=
factory_ext=
factory_suffix=
other_suffix_openwrt=
other_suffix_gluon=
sysupgrade_ext=
sysupgrade_suffix=
no_opkg=
mkdir -p "${GLUON_IMAGEDIR}/factory" "${GLUON_IMAGEDIR}/sysupgrade"
mkdir -p "${GLUON_IMAGEDIR}/factory" "${GLUON_IMAGEDIR}/other" "${GLUON_IMAGEDIR}/sysupgrade"
if [ "$(expr match "$OPENWRT_TARGET" '.*-.*')" -gt 0 ]; then
OPENWRT_BINDIR="${OPENWRT_TARGET//-/\/}"
@ -49,6 +53,18 @@ copy() {
done
fi
if [ "$other_suffix_openwrt" ]; then
rm -f "${GLUON_IMAGEDIR}/other/gluon-"*"-${output}-${other_suffix_gluon}"
cp "openwrt/bin/targets/${OPENWRT_BINDIR}/openwrt-${OPENWRT_TARGET}${profile}${other_suffix_openwrt}" \
"${GLUON_IMAGEDIR}/other/gluon-${SITE_CODE}-${GLUON_RELEASE}-${output}-${other_suffix_gluon}"
for alias in $aliases; do
rm -f "${GLUON_IMAGEDIR}/other/gluon-"*"-${alias}-${other_suffix_gluon}"
ln -s "gluon-${SITE_CODE}-${GLUON_RELEASE}-${output}-${other_suffix_gluon}" \
"${GLUON_IMAGEDIR}/other/gluon-${SITE_CODE}-${GLUON_RELEASE}-${alias}-${other_suffix_gluon}"
done
fi
if [ "$sysupgrade_ext" ]; then
rm -f "${GLUON_IMAGEDIR}/sysupgrade/gluon-"*"-${output}-sysupgrade${sysupgrade_ext}"
cp "openwrt/bin/targets/${OPENWRT_BINDIR}/openwrt-${OPENWRT_TARGET}${profile}${sysupgrade_suffix}${sysupgrade_ext}" \
@ -74,6 +90,8 @@ device() {
factory_ext="$default_factory_ext"
factory_suffix="$default_factory_suffix"
other_suffix_openwrt="$default_other_suffix_openwrt"
other_suffix_gluon="$default_other_suffix_gluon"
sysupgrade_ext="$default_sysupgrade_ext"
sysupgrade_suffix="$default_sysupgrade_suffix"
}
@ -148,6 +166,11 @@ sysupgrade() {
fi
}
other() {
other_suffix_openwrt="$1"
other_suffix_gluon="$2"
}
no_opkg() {
no_opkg=1
}