From patchwork Tue Aug 7 19:22:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 954643 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41lPY82M4Nz9s4c; Wed, 8 Aug 2018 05:22:36 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fn7Ys-00050F-SO; Tue, 07 Aug 2018 19:22:30 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fn7Yp-0004ys-L5 for kernel-team@lists.ubuntu.com; Tue, 07 Aug 2018 19:22:27 +0000 Received: from 1.general.kamal.us.vpn ([10.172.68.52] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fn7Yp-0006Fz-92; Tue, 07 Aug 2018 19:22:27 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1fn7Ym-0007wE-6P; Tue, 07 Aug 2018 12:22:24 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH] git-build-kernel: do not expect orig tarball for debian "native" packages Date: Tue, 7 Aug 2018 12:22:23 -0700 Message-Id: <1533669743-30477-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andy.whitcroft@canonical.com MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Determine whether or not to expect an orig tarball based on the file debian/source/format, as follows: - if the file does not exist: NO orig tarball - if the file contains "native" e.g. "3.0 (native)": NO orig tarball - otherwise: YES orig tarball This eliminates the need for name-based special cases for -meta and -signed and allows for the construction of main kernel source packages when an orig tarball has not (yet) been published. Signed-off-by: Kamal Mostafa Acked-by: Andy Whitcroft Acked-by: Khalid Elmously --- git-build-kernel/git-build-kernel | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/git-build-kernel/git-build-kernel b/git-build-kernel/git-build-kernel index ad6c3c5..831c0af 100755 --- a/git-build-kernel/git-build-kernel +++ b/git-build-kernel/git-build-kernel @@ -142,11 +142,10 @@ touch "$WORKDIR/building" trap "rm -rf $WORKDIR/building $BUILDDIR" 0 [ $do_source_pkg = 1 ] && { - ### Special case for linux-signed and linux-meta packages, which - ### have no .orig tarball - [ ${SRCPKG/-signed} != $SRCPKG ] && no_orig_tarball=1 - [ ${SRCPKG/-meta} != $SRCPKG ] && no_orig_tarball=1 - if [ "$no_orig_tarball" = 1 ] + deb_format="$(git show $GITBRANCH:debian/source/format 2>/dev/null)" + [ -z "$deb_format" ] && no_orig_tarball=1 + [ "${deb_format/native/}" != "$deb_format" ] && no_orig_tarball=1 + if [ "$no_orig_tarball" == 1 ] then srcpkg_debopts="--no-tgz-check $srcpkg_debopts" else