From 4d2f86a1ebcfc952080386603354c4767d2c8825 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 18 Jan 2019 13:28:22 +0100 Subject: Rework of debian packaging Change-Id: Ifede85d3af36f3ee6c6f8f92dcf5db0ed8f1bfeb Signed-off-by: Damjan Marion Signed-off-by: Dave Barach --- build-root/scripts/csit-test-branch | 16 -------- build-root/scripts/find-api-core-contents | 23 ------------ build-root/scripts/find-api-lib-contents | 19 ---------- build-root/scripts/find-dev-contents | 49 ------------------------ build-root/scripts/find-plugins-contents | 28 -------------- build-root/scripts/find-vpp-api-java-contents | 21 ----------- build-root/scripts/find-vpp-api-lua-contents | 19 ---------- build-root/scripts/find-vpp-api-python-contents | 21 ----------- build-root/scripts/generate-deb-changelog | 50 ------------------------- build-root/scripts/remove-rpath | 38 +------------------ 10 files changed, 1 insertion(+), 283 deletions(-) delete mode 100755 build-root/scripts/csit-test-branch delete mode 100755 build-root/scripts/find-api-core-contents delete mode 100755 build-root/scripts/find-api-lib-contents delete mode 100755 build-root/scripts/find-dev-contents delete mode 100755 build-root/scripts/find-plugins-contents delete mode 100755 build-root/scripts/find-vpp-api-java-contents delete mode 100755 build-root/scripts/find-vpp-api-lua-contents delete mode 100755 build-root/scripts/find-vpp-api-python-contents delete mode 100755 build-root/scripts/generate-deb-changelog mode change 100755 => 120000 build-root/scripts/remove-rpath (limited to 'build-root/scripts') diff --git a/build-root/scripts/csit-test-branch b/build-root/scripts/csit-test-branch deleted file mode 100755 index 23cfae1e1b7..00000000000 --- a/build-root/scripts/csit-test-branch +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# Copyright (c) 2015 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -echo latest diff --git a/build-root/scripts/find-api-core-contents b/build-root/scripts/find-api-core-contents deleted file mode 100755 index 8e24584be39..00000000000 --- a/build-root/scripts/find-api-core-contents +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -for i in $(find ${1}/vpp/share/vpp/api/core -name *.api.json -type f -print); do - echo ../${i} /usr/share/vpp/api/ >> ${2} -done -for i in $(find ${1}/vlib-api -name *.api.json -type f -print); do - echo ../${i} /usr/share/vpp/api/ >> ${2} -done - diff --git a/build-root/scripts/find-api-lib-contents b/build-root/scripts/find-api-lib-contents deleted file mode 100755 index b0742662415..00000000000 --- a/build-root/scripts/find-api-lib-contents +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -for i in $(find ${1}/vnet -name *.api.json -type f -print); do - echo ../${i} /usr/share/vpp/api/ >> ${2} -done - diff --git a/build-root/scripts/find-dev-contents b/build-root/scripts/find-dev-contents deleted file mode 100755 index 0f1104591b8..00000000000 --- a/build-root/scripts/find-dev-contents +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# includes -paths=`find $1/*/include -type f -print | grep -v '/dpdk/include/'` -rm -f $2 - -for path in $paths -do - relpath=`echo $path | sed -e 's:.*/include/::'` - dir=`dirname $relpath` - if [ $dir = "." ] ; then - echo ../$path /usr/include >> $2 - else - echo ../$path /usr/include/$dir >> $2 - fi -done - -# Perf monitor .json tarball -for i in $(find ${1}/vpp/share/vpp/plugins/perfmon -name *.tar.xz -type f -print); do - echo ../${i} /usr/share/vpp/plugins/perfmon >> ${2} -done - -# sample plugin -paths=`(cd ..; find src/examples/sample-plugin -type f -print | grep -v autom4te)` - -for path in $paths -do - relpath=`echo $path | sed -e 's:.*src/examples/::'` - dir=`dirname $relpath` - if [ $dir = "sample-plugin" ] ; then - echo ../../$path /usr/share/doc/vpp/examples/sample-plugin/ >> $2 - else - echo ../../$path \ - /usr/share/doc/vpp/examples/$dir >> $2 - fi -done diff --git a/build-root/scripts/find-plugins-contents b/build-root/scripts/find-plugins-contents deleted file mode 100755 index 9b39cc88e60..00000000000 --- a/build-root/scripts/find-plugins-contents +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -rm -f $2 - -for i in ${1}/vpp/lib/vpp_plugins/*.so; do - echo ../${i} /usr/lib/vpp_plugins >> ${2} -done - -for i in ${1}/vpp/lib/vpp_api_test_plugins/*.so; do - echo ../${i} /usr/lib/vpp_api_test_plugins >> ${2} -done - -for i in $(find ${1}/plugins ${1}/vpp/share/vpp/api/plugins/ -name *.api.json -type f -print); do - echo ../${i} /usr/share/vpp/api/ >> ${2} -done diff --git a/build-root/scripts/find-vpp-api-java-contents b/build-root/scripts/find-vpp-api-java-contents deleted file mode 100755 index b4cf52fcf58..00000000000 --- a/build-root/scripts/find-vpp-api-java-contents +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -rm -f $2 - -for i in $(find ${1}/japi/share/java/ -type f -print); do - echo ../${i} /usr/share/java >> ${2} -done - diff --git a/build-root/scripts/find-vpp-api-lua-contents b/build-root/scripts/find-vpp-api-lua-contents deleted file mode 100755 index 576bbb82562..00000000000 --- a/build-root/scripts/find-vpp-api-lua-contents +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#i for now put everything into examples directory - -echo ../../src/vpp-api/lua /usr/share/vpp/examples > ${2} - diff --git a/build-root/scripts/find-vpp-api-python-contents b/build-root/scripts/find-vpp-api-python-contents deleted file mode 100755 index f6de6f2fffa..00000000000 --- a/build-root/scripts/find-vpp-api-python-contents +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -rm -f $2 - -for i in $(find ${1}/vpp/lib/python2.7/site-packages/ -type f -print); do - echo ../${i} /usr/lib/python2.7/site-packages/vpp_papi >> ${2} -done - diff --git a/build-root/scripts/generate-deb-changelog b/build-root/scripts/generate-deb-changelog deleted file mode 100755 index d3112f778ac..00000000000 --- a/build-root/scripts/generate-deb-changelog +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -CHANGELOG=deb/debian/changelog -DIST=unstable -FIRST=1 - -print_changelog_item() { - DATE=$(git log -1 --format=%cD ${TAG}) - DEBFULLNAME=$(git log -1 --format=%an ${TAG}) - DEBEMAIL=$(git log -1 --format=%ae ${TAG}) - - if [ ${FIRST} = 0 ]; then echo >> ${CHANGELOG}; fi - FIRST=0 - - echo "vpp (${VER}) ${DIST}; urgency=low" >> ${CHANGELOG} - echo >> ${CHANGELOG} - echo "${DESC}" >> ${CHANGELOG} - echo >> ${CHANGELOG} - echo " -- ${DEBFULLNAME} <${DEBEMAIL}> ${DATE}" >> ${CHANGELOG} -} - -VER=$(scripts/version) -TAG=HEAD -ADDS=$(echo ${VER} | sed -e 's/~.*//'| cut -s -d- -f2) - -rm -f ${CHANGELOG} - -if [ -n "${ADDS}" ]; then - DESC=" * includes ${ADDS} commits after $(echo ${VER}| cut -d- -f1) release" - print_changelog_item -fi - -for TAG in $(git tag -l 'v[0-9][0-9].[0-9][0-9]' | sort -r ); do - VER=$(echo ${TAG}| sed -e 's/^v//') - DESC=$(git tag -l -n20 ${TAG} | tail -n+2 | sed -e 's/^ */ /') - print_changelog_item -done diff --git a/build-root/scripts/remove-rpath b/build-root/scripts/remove-rpath deleted file mode 100755 index 3e20b06dbfa..00000000000 --- a/build-root/scripts/remove-rpath +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2015 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if [ -z $1 ]; then - echo "Please specify path" - exit 1 -fi - -which chrpath &> /dev/null - -if [ $? -ne 0 ] ; then - echo "Please install chrpath tool" - exit 1 -fi - -libs=$(find $1 -type f -name \*.so\*) -execs=$(find $1 -type f -path \*/bin/\* ) - -for i in $libs $execs; do - chrpath $i 2> /dev/null | grep -q build-root - if [ $? -eq 0 ] ; then - chrpath -d $i - fi -done - diff --git a/build-root/scripts/remove-rpath b/build-root/scripts/remove-rpath new file mode 120000 index 00000000000..f7c05f1e908 --- /dev/null +++ b/build-root/scripts/remove-rpath @@ -0,0 +1 @@ +../../src/scripts/remove-rpath \ No newline at end of file -- cgit 1.2.3-korg