Message ID | 1458305959-26825-6-git-send-email-anders.roxell@linaro.org |
---|---|
State | Accepted |
Commit | 2b2910a07dc1a52c57c99b609abb537504daf583 |
Headers | show |
On Fri, Mar 18, 2016 at 9:59 AM, Anders Roxell <anders.roxell@linaro.org> wrote: > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > --- > scripts/builddeb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/builddeb b/scripts/builddeb > index 0fa8754..988cb5d 100755 > --- a/scripts/builddeb > +++ b/scripts/builddeb > @@ -23,7 +23,7 @@ cp -r ${ROOT_DIR}/pkg/debian . > current=$(echo ${version} | awk -F . '{printf("%d\n", (($1 * 100) + $2))}') > rename 's,(.*linux)(.*),${1}'"${current}"'${2},' debian/*odp*-linux.install > > -sed -i "s:\(.*odp-linux\)\([^\.]\|$\):\1${current}\2:g" debian/control > +sed -i "s:\(.*odp-linux\)\(-dbg\|$\| \):\1${current}\2:g" debian/control > sed -i "s:\(.*odp-linux\)\(.*\):\1${current}\2:g" debian/rules > > if [ $(egrep "\.([a-z0-9]{8}\>|dirty)" .scmversion |wc -l) -gt 0 ]; then > -- > 2.1.4 Reviewed-by: Ricardo Salveti <ricardo.salveti@linaro.org>
diff --git a/scripts/builddeb b/scripts/builddeb index 0fa8754..988cb5d 100755 --- a/scripts/builddeb +++ b/scripts/builddeb @@ -23,7 +23,7 @@ cp -r ${ROOT_DIR}/pkg/debian . current=$(echo ${version} | awk -F . '{printf("%d\n", (($1 * 100) + $2))}') rename 's,(.*linux)(.*),${1}'"${current}"'${2},' debian/*odp*-linux.install -sed -i "s:\(.*odp-linux\)\([^\.]\|$\):\1${current}\2:g" debian/control +sed -i "s:\(.*odp-linux\)\(-dbg\|$\| \):\1${current}\2:g" debian/control sed -i "s:\(.*odp-linux\)\(.*\):\1${current}\2:g" debian/rules if [ $(egrep "\.([a-z0-9]{8}\>|dirty)" .scmversion |wc -l) -gt 0 ]; then
Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- scripts/builddeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)