diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2017-09-14 10:56:39 +0300 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2017-09-14 10:56:39 +0300 |
| commit | e99707b55c325193c93395b06cabfc7cd6fcebb0 (patch) | |
| tree | 56aecc75bab605898529688b729c3ba095d23c97 /files/etc/apt/sources.list.d | |
| parent | 153419227010216f50debe95a5077e3ccfbdd101 (diff) | |
actually make it work
Diffstat (limited to 'files/etc/apt/sources.list.d')
4 files changed, 8 insertions, 22 deletions
diff --git a/files/etc/apt/sources.list.d/backports.list/BACKPORTS b/files/etc/apt/sources.list.d/backports.list/BACKPORTS index 8b6f4c9..7046e1d 100644 --- a/files/etc/apt/sources.list.d/backports.list/BACKPORTS +++ b/files/etc/apt/sources.list.d/backports.list/BACKPORTS @@ -1,2 +1,2 @@ -deb {cdn}/debian {release}-backports main -deb-src {cdn}/debian {release}-backports main +deb ${cdn}/debian ${release}-backports main +deb-src ${cdn}/debian ${release}-backports main diff --git a/files/etc/apt/sources.list.d/backports.list/preinst b/files/etc/apt/sources.list.d/backports.list/preinst index 81f7d06..ee32e3a 100755 --- a/files/etc/apt/sources.list.d/backports.list/preinst +++ b/files/etc/apt/sources.list.d/backports.list/preinst @@ -1,23 +1,10 @@ #! /bin/bash -# template expansion for sources.list: -# replace {release} with the value of $release -# replace {cdn} with the value of $apt_cdn +# template expansion # $1 is the class name used # $2 is the path to the file copied -# check if a variable of the form {varname} was used at all -grep -q '{' $2 || exit 0 +envsubst < $2 > $2.tmp +mv $2.tmp $2 -if [ -z "$release" ]; then - echo "\$release is undefined. Not substituting in $2." -else - sed -i -e "s#{release}#$release#g" $2 -fi - -if [ -z "$apt_cdn" ]; then - echo "\$apt_cdn not defined. not substituting in $2." -else - sed -i -e "s#{cdn}#$apt_cdn#g" $2 -fi diff --git a/files/etc/apt/sources.list.d/linaro.list/LINARO b/files/etc/apt/sources.list.d/linaro.list/LINARO index e4da3cf..650cab0 100644 --- a/files/etc/apt/sources.list.d/linaro.list/LINARO +++ b/files/etc/apt/sources.list.d/linaro.list/LINARO @@ -1 +1,2 @@ -deb http://obs.linaro.org/qcom/${obs_release}/ ./ +deb http://obs.linaro.org/linaro-overlay-${release}/${obs_release}/ ./ + diff --git a/files/etc/apt/sources.list.d/linaro.list/QCOM b/files/etc/apt/sources.list.d/linaro.list/QCOM index de2aaba..2babf21 100644 --- a/files/etc/apt/sources.list.d/linaro.list/QCOM +++ b/files/etc/apt/sources.list.d/linaro.list/QCOM @@ -1,3 +1 @@ -deb http://obs.linaro.org/qcom/${obs_release}/ ./ -deb http://obs.linaro.org/linaro-overlay-${obs_release}/ ./ - +deb http://obs.linaro.org/qcom/${release}/ ./ |