From patchwork Fri Oct 30 20:57:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 55858 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp85012lbr; Fri, 30 Oct 2015 14:07:33 -0700 (PDT) X-Received: by 10.55.192.22 with SMTP id o22mr7284192qki.12.1446239253456; Fri, 30 Oct 2015 14:07:33 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 69si7602880qgt.1.2015.10.30.14.07.33; Fri, 30 Oct 2015 14:07:33 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: by lists.linaro.org (Postfix, from userid 109) id 1994562C7F; Fri, 30 Oct 2015 21:07:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 069B162C8A; Fri, 30 Oct 2015 21:03:14 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id F213E62C61; Fri, 30 Oct 2015 21:02:39 +0000 (UTC) Received: from mail-lf0-f49.google.com (mail-lf0-f49.google.com [209.85.215.49]) by lists.linaro.org (Postfix) with ESMTPS id 4ACE462C77 for ; Fri, 30 Oct 2015 21:02:03 +0000 (UTC) Received: by lffz202 with SMTP id z202so39518038lff.3 for ; Fri, 30 Oct 2015 14:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AuroNhKdzG0B5qObmZBgmVO3eb92z5JrloUuUaHfwR0=; b=GwXWGW8Csbia13Ym0uGsV4LEr4s1aADDloCI/mRjjZjr0DL9DFjR6Gw4sdii5OLwe0 SY8KIRDaW2FFat3+PO6wTMQcbhI1TpenUd2gh2Be5HfHlNPmr3jX0PcNTjFU4DQ6w6YD PGluYZXmmrAUeeYxHZkXbOwv2LHmKtNbZE2bboSAl+i/a79tMnIqH70wqyyyHF0u/s4J W7vguplWpvtPUnfhTOj8ul3h30C4qpgqohgABqPycbEVeEfyh1VEIzDmAzUmZKlMqvEl 62l8Wv6gKtxO+Ro/r4fsG/oqhE0NJTLNQjkqPukv0H5VUDIrmZ7FcwZofPCsV8+gr00Y UNRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AuroNhKdzG0B5qObmZBgmVO3eb92z5JrloUuUaHfwR0=; b=lDbbvmCKcYaI9hamYYNy5uRwgeIgHN13eK/K+jzaSQLfVl9SoVz+7jML/6C8Lbu9EO b5tlPemjYysUF4mhYL+XgSfAlJtiECuSejKyUzDQjp3zYPt/W4ujyLFIfyq6e1IJwCwR a6WFtWxynmJKemQZQ9VOz5yGUtHRwgOa3kd5wmcIzFnTk3u635DEiJCxIWeUE91zXtWb QzyoI1yoWtOuuLEiQuPs/rkfuZOyk/7dMddfjwnazBQwX1R80I5Oq0jhsdsreyHiq204 0xZX5LiSvCE0HdcX+0XL4EQBswy+R6ObZZr269JjbNZVQWd5Phwu9jPSICb3Ve70SZgO jyuw== X-Gm-Message-State: ALoCoQk0zAzikNqxEY+W9TpbXynUeU/h9RPXwwwH76/vx3UcMiA6caTBVQ9TE2jtbSiShGRSxyux X-Received: by 10.25.132.204 with SMTP id g195mr3354529lfd.58.1446238922095; Fri, 30 Oct 2015 14:02:02 -0700 (PDT) Received: from localhost (c-893970d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.57.137]) by smtp.gmail.com with ESMTPSA id yp7sm1561884lbb.47.2015.10.30.14.02.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Oct 2015 14:02:01 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Fri, 30 Oct 2015 21:57:47 +0100 Message-Id: <1446238668-15200-8-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446238668-15200-1-git-send-email-anders.roxell@linaro.org> References: <1446238668-15200-1-git-send-email-anders.roxell@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv2 7/8] scripts: make rpm packages X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Anders Roxell Reviewed-by: Fathi Boudra --- {debian => pkg/debian}/README.Debian | 0 {debian => pkg/debian}/changelog | 0 {debian => pkg/debian}/compat | 0 {debian => pkg/debian}/control | 0 {debian => pkg/debian}/copyright | 0 {debian => pkg/debian}/docs | 0 {debian => pkg/debian}/libodp-dev.dirs | 0 {debian => pkg/debian}/libodp-dev.install | 0 {debian => pkg/debian}/libodp.dirs | 0 {debian => pkg/debian}/libodp.install | 0 {debian => pkg/debian}/libodphelper-dev.dirs | 0 {debian => pkg/debian}/libodphelper-dev.install | 0 {debian => pkg/debian}/libodphelper.dirs | 0 {debian => pkg/debian}/libodphelper.install | 0 {debian => pkg/debian}/odp-bin.dirs | 0 {debian => pkg/debian}/odp-bin.install | 0 {debian => pkg/debian}/rules | 0 {debian => pkg/debian}/source/format | 0 scripts/builddeb | 16 +++++-------- scripts/buildrpm | 30 +++++++++++++++++++++++++ scripts/common_pkg_build.sh | 17 ++++++++++++++ 21 files changed, 52 insertions(+), 11 deletions(-) rename {debian => pkg/debian}/README.Debian (100%) rename {debian => pkg/debian}/changelog (100%) rename {debian => pkg/debian}/compat (100%) rename {debian => pkg/debian}/control (100%) rename {debian => pkg/debian}/copyright (100%) rename {debian => pkg/debian}/docs (100%) rename {debian => pkg/debian}/libodp-dev.dirs (100%) rename {debian => pkg/debian}/libodp-dev.install (100%) rename {debian => pkg/debian}/libodp.dirs (100%) rename {debian => pkg/debian}/libodp.install (100%) rename {debian => pkg/debian}/libodphelper-dev.dirs (100%) rename {debian => pkg/debian}/libodphelper-dev.install (100%) rename {debian => pkg/debian}/libodphelper.dirs (100%) rename {debian => pkg/debian}/libodphelper.install (100%) rename {debian => pkg/debian}/odp-bin.dirs (100%) rename {debian => pkg/debian}/odp-bin.install (100%) rename {debian => pkg/debian}/rules (100%) rename {debian => pkg/debian}/source/format (100%) create mode 100755 scripts/buildrpm create mode 100644 scripts/common_pkg_build.sh diff --git a/debian/README.Debian b/pkg/debian/README.Debian similarity index 100% rename from debian/README.Debian rename to pkg/debian/README.Debian diff --git a/debian/changelog b/pkg/debian/changelog similarity index 100% rename from debian/changelog rename to pkg/debian/changelog diff --git a/debian/compat b/pkg/debian/compat similarity index 100% rename from debian/compat rename to pkg/debian/compat diff --git a/debian/control b/pkg/debian/control similarity index 100% rename from debian/control rename to pkg/debian/control diff --git a/debian/copyright b/pkg/debian/copyright similarity index 100% rename from debian/copyright rename to pkg/debian/copyright diff --git a/debian/docs b/pkg/debian/docs similarity index 100% rename from debian/docs rename to pkg/debian/docs diff --git a/debian/libodp-dev.dirs b/pkg/debian/libodp-dev.dirs similarity index 100% rename from debian/libodp-dev.dirs rename to pkg/debian/libodp-dev.dirs diff --git a/debian/libodp-dev.install b/pkg/debian/libodp-dev.install similarity index 100% rename from debian/libodp-dev.install rename to pkg/debian/libodp-dev.install diff --git a/debian/libodp.dirs b/pkg/debian/libodp.dirs similarity index 100% rename from debian/libodp.dirs rename to pkg/debian/libodp.dirs diff --git a/debian/libodp.install b/pkg/debian/libodp.install similarity index 100% rename from debian/libodp.install rename to pkg/debian/libodp.install diff --git a/debian/libodphelper-dev.dirs b/pkg/debian/libodphelper-dev.dirs similarity index 100% rename from debian/libodphelper-dev.dirs rename to pkg/debian/libodphelper-dev.dirs diff --git a/debian/libodphelper-dev.install b/pkg/debian/libodphelper-dev.install similarity index 100% rename from debian/libodphelper-dev.install rename to pkg/debian/libodphelper-dev.install diff --git a/debian/libodphelper.dirs b/pkg/debian/libodphelper.dirs similarity index 100% rename from debian/libodphelper.dirs rename to pkg/debian/libodphelper.dirs diff --git a/debian/libodphelper.install b/pkg/debian/libodphelper.install similarity index 100% rename from debian/libodphelper.install rename to pkg/debian/libodphelper.install diff --git a/debian/odp-bin.dirs b/pkg/debian/odp-bin.dirs similarity index 100% rename from debian/odp-bin.dirs rename to pkg/debian/odp-bin.dirs diff --git a/debian/odp-bin.install b/pkg/debian/odp-bin.install similarity index 100% rename from debian/odp-bin.install rename to pkg/debian/odp-bin.install diff --git a/debian/rules b/pkg/debian/rules similarity index 100% rename from debian/rules rename to pkg/debian/rules diff --git a/debian/source/format b/pkg/debian/source/format similarity index 100% rename from debian/source/format rename to pkg/debian/source/format diff --git a/scripts/builddeb b/scripts/builddeb index 8a52044..829fd1d 100755 --- a/scripts/builddeb +++ b/scripts/builddeb @@ -2,20 +2,14 @@ set -e -ROOT_DIR=$(readlink -e $(dirname $0) | sed 's|/scripts||') +export ROOT_DIR=$(readlink -e $(dirname $0) | sed 's|/scripts||') -pushd ${ROOT_DIR} -./bootstrap -./configure -make dist +source ${ROOT_DIR}/scripts/common_pkg_build.sh -version=$(cat ${ROOT_DIR}/.scmversion) +prepare_tarball -cp opendataplane-${version}.tar.gz opendataplane_${version}.orig.tar.gz -tar xzf opendataplane_${version}.orig.tar.gz - -pushd ${ROOT_DIR}/opendataplane-${version} -cp -r ${ROOT_DIR}/debian . +pushd ${ROOT_DIR}/${package}-${version} +cp -r ${ROOT_DIR}/pkg/debian . current=$(echo ${version} | awk -F . '{printf("%d\n", (($1 * 100) + $2))}') rename 's,([^-\.]*)(.*),${1}'"${current}"'${2},' debian/*odp* diff --git a/scripts/buildrpm b/scripts/buildrpm new file mode 100755 index 0000000..8568592 --- /dev/null +++ b/scripts/buildrpm @@ -0,0 +1,30 @@ +#!/bin/bash + +set -e + +export ROOT_DIR=$(readlink -e $(dirname $0) | sed 's|/scripts||') + +source ${ROOT_DIR}/scripts/common_pkg_build.sh + +prepare_tarball + +mkdir -p ${ROOT_DIR}/rpm/RPMS +mkdir -p ${ROOT_DIR}/rpm/SRPMS +mkdir -p ${ROOT_DIR}/rpm/BUILD +mkdir -p ${ROOT_DIR}/rpm/SOURCES +mkdir -p ${ROOT_DIR}/rpm/tmp +rm -rf ${ROOT_DIR}/rpm/BUILD/${package}-root +rm -rf ${ROOT_DIR}/rpm/RPMS/${package}* +rm -rf ${ROOT_DIR}/rpm/SRPMS/${package}* +rm -rf ${ROOT_DIR}/rpm/SOURCES/${package}* +cp ${ROOT_DIR}/${package}-${version}.tar.gz ${ROOT_DIR}/rpm/SOURCES/ +cp ${ROOT_DIR}/pkg/rpm/odp.spec ${ROOT_DIR}/rpm/odp.spec +if [ $(egrep "\.([a-z0-9]{8}\>|dirty)" .scmversion |wc -l) -gt 0 ]; then + creation_date=$(date '+%a %b %e %G') + RPMEMAIL="donald.duck (at) linaro.org" + sed -i -e "s/changelog/changelog\n* ${creation_date} - ${RPMEMAIL}\n- not a official release\!/g" ${ROOT_DIR}/rpm/odp.spec +fi +sed -i "s|^Version: .*$|Version: ${version}|g" ${ROOT_DIR}/rpm/odp.spec +rpmbuild --quiet --nodeps --define="_topdir ${ROOT_DIR}/rpm" -ba ${ROOT_DIR}/rpm/odp.spec +cp ${ROOT_DIR}/rpm/RPMS/*/* ${ROOT_DIR}/ +popd diff --git a/scripts/common_pkg_build.sh b/scripts/common_pkg_build.sh new file mode 100644 index 0000000..cf4f6e3 --- /dev/null +++ b/scripts/common_pkg_build.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +set -e + +prepare_tarball() { + export package=opendataplane + + pushd ${ROOT_DIR} + ./bootstrap + ./configure + make dist + + version=$(cat ${ROOT_DIR}/.scmversion) + + cp ${package}-${version}.tar.gz ${package}_${version}.orig.tar.gz + tar xzf ${package}_${version}.orig.tar.gz +}