From patchwork Thu Jul 19 19:50:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 946585 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 41Wl4t3Fmwz9s4Z; Fri, 20 Jul 2018 05:51:10 +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 1fgEx2-0004lD-IM; Thu, 19 Jul 2018 19:51:00 +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 1fgEx0-0004kT-9G for kernel-team@lists.ubuntu.com; Thu, 19 Jul 2018 19:50:58 +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 1fgEwz-00037O-TE for kernel-team@lists.ubuntu.com; Thu, 19 Jul 2018 19:50:58 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1fgEwx-0006jd-F2 for kernel-team@lists.ubuntu.com; Thu, 19 Jul 2018 12:50:55 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH 1/4] git-build-kernel: extract the correct source package name Date: Thu, 19 Jul 2018 12:50:51 -0700 Message-Id: <1532029854-25830-2-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532029854-25830-1-git-send-email-kamal@canonical.com> References: <1532029854-25830-1-git-send-email-kamal@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" And use it to find the correct .orig tarball when building source packages. Signed-off-by: Kamal Mostafa --- git-build-kernel/git-build-kernel | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-build-kernel/git-build-kernel b/git-build-kernel/git-build-kernel index df95e12..44e38c8 100755 --- a/git-build-kernel/git-build-kernel +++ b/git-build-kernel/git-build-kernel @@ -80,6 +80,7 @@ DISTRO=$( do [ "$DISTRO" != "UNRELEASED" ] && { echo $DISTRO; break; } done ) +SRCPKG=$(git show $GITBRANCH:$DEBIAN/changelog | sed 's/^\(.*\) (.*/\1/;q') CHROOT="$DISTRO" CHROOT="${CHROOT%-proposed}" if [ "$CHROOT" = "UNRELEASED" -o -z "$CHROOT" ] @@ -116,7 +117,7 @@ touch "$WORKDIR/building" trap "rm -rf $WORKDIR/building $BUILDDIR" 0 [ $do_source_pkg = 1 ] && { - orig_tarball="linux_${VERSION%%-*}.orig.tar.gz" + orig_tarball="${SRCPKG}_${VERSION%%-*}.orig.tar.gz" # Careful: $ORIG_TARBALLS_DIR must be accessible from within the chroot. # (Alternately, use "cp -p" instead of "ln -s" if that's not an option) ln -s $ORIG_TARBALLS_DIR/$orig_tarball $WORKDIR/ From patchwork Thu Jul 19 19:50:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 946584 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 41Wl4t3cX5z9s7X; Fri, 20 Jul 2018 05:51:10 +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 1fgEx6-0004nA-3o; Thu, 19 Jul 2018 19:51:04 +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 1fgEx0-0004kf-Km for kernel-team@lists.ubuntu.com; Thu, 19 Jul 2018 19:50:58 +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 1fgEx0-00037Q-8a for kernel-team@lists.ubuntu.com; Thu, 19 Jul 2018 19:50:58 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1fgEwy-0006ju-2l for kernel-team@lists.ubuntu.com; Thu, 19 Jul 2018 12:50:56 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH 2/4] git-build-kernel: improve results summary for source pkgs Date: Thu, 19 Jul 2018 12:50:52 -0700 Message-Id: <1532029854-25830-3-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532029854-25830-1-git-send-email-kamal@canonical.com> References: <1532029854-25830-1-git-send-email-kamal@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Add a 'debsign -r' cut-n-paste fragment. Be more explicit about which chroot is used. Signed-off-by: Kamal Mostafa --- git-build-kernel/git-build-kernel | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/git-build-kernel/git-build-kernel b/git-build-kernel/git-build-kernel index 44e38c8..6dd0792 100755 --- a/git-build-kernel/git-build-kernel +++ b/git-build-kernel/git-build-kernel @@ -131,10 +131,11 @@ trap "rm -rf $WORKDIR/building $BUILDDIR" 0 ### run the standard debian/rules invocations like a pkgbuilder would ### -echo "git-build-kernel ($CHROOT)" -echo " version: $DISTRO ($VERSION)" +echo "git-build-kernel" +echo " package: $SRCPKG ($VERSION) $DISTRO" echo " targets: $TARGETS" echo " arch: $ARCH" +echo " chroot: $CHROOT" echo " starting build in $HOSTNAME:$WORKDIR ..." function show_elapsed @@ -214,10 +215,17 @@ echo " $HOSTNAME:$LOG" # cat $LOG -if [ $STATUS = 0 ] +[ $STATUS != 0 ] && exit $STATUS + +if [ $do_source_pkg = 1 ] then + changesfile=$(ls "$WORKDIR"/*_source.changes) + echo " source package files:" + echo " $HOSTNAME:${WORKDIR}" + echo " ready for debsign and upload:" + echo " debsign -r $HOSTNAME ${changesfile}" +else echo " binary packages:" echo " $HOSTNAME:$WORKDIR/" fi -exit $STATUS From patchwork Thu Jul 19 19:50:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 946586 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 41Wl4t71msz9s8F; Fri, 20 Jul 2018 05:51:10 +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 1fgEx6-0004nQ-E7; Thu, 19 Jul 2018 19:51:04 +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 1fgEx1-0004kl-9j for kernel-team@lists.ubuntu.com; Thu, 19 Jul 2018 19:50:59 +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 1fgEx0-00037T-Te for kernel-team@lists.ubuntu.com; Thu, 19 Jul 2018 19:50:59 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1fgEwy-0006jy-Lt for kernel-team@lists.ubuntu.com; Thu, 19 Jul 2018 12:50:56 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH 3/4] git-build-kernel: support SOURCE_PACKAGE_CHROOT=series via debian.env Date: Thu, 19 Jul 2018 12:50:53 -0700 Message-Id: <1532029854-25830-4-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532029854-25830-1-git-send-email-kamal@canonical.com> References: <1532029854-25830-1-git-send-email-kamal@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" When building a source package via the "git push commit-ish:source" method... If debian/debian.env contains a "SOURCE_PACKAGE_CHROOT=series" line (where series is a distro series like 'xenial') then git-build-kernel will build the source package in a chroot of that specified series. If no SOURCE_PACKAGE_CHROOT line exists, then git-build-kernel will use a chroot of the series indicated by debian/changelog. The SOURCE_PACKAGE_CHROOT feature applies only to *source* package builds; binary packages are always built in a chroot of the series indicated by debian/changelog. Signed-off-by: Kamal Mostafa --- git-build-kernel/git-build-kernel | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/git-build-kernel/git-build-kernel b/git-build-kernel/git-build-kernel index 6dd0792..cfad062 100755 --- a/git-build-kernel/git-build-kernel +++ b/git-build-kernel/git-build-kernel @@ -83,6 +83,10 @@ DISTRO=$( SRCPKG=$(git show $GITBRANCH:$DEBIAN/changelog | sed 's/^\(.*\) (.*/\1/;q') CHROOT="$DISTRO" CHROOT="${CHROOT%-proposed}" +[ $do_source_pkg = 1 ] && { + eval `git show $GITBRANCH:debian/debian.env | grep SOURCE_PACKAGE_CHROOT=` + [ -z "$SOURCE_PACKAGE_CHROOT" ] || CHROOT="$SOURCE_PACKAGE_CHROOT" +} if [ "$CHROOT" = "UNRELEASED" -o -z "$CHROOT" ] then GITREPOBASE="${GITREPO%/*}" # e.g. /home/kamal/src/linux From patchwork Tue Jul 31 20:07:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 951787 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 41g6tx0QxMz9s2L; Wed, 1 Aug 2018 06:08:09 +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 1fkaw5-00049c-P7; Tue, 31 Jul 2018 20:08:01 +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 1fkaw5-000495-7X for kernel-team@lists.ubuntu.com; Tue, 31 Jul 2018 20:08:01 +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 1fkaw4-0001Za-RA for kernel-team@lists.ubuntu.com; Tue, 31 Jul 2018 20:08:01 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1fkaw2-0005ww-7l for kernel-team@lists.ubuntu.com; Tue, 31 Jul 2018 13:07:58 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH 5/6] git-build-kernel: squelch output noise when there is no debian/debian.env Date: Tue, 31 Jul 2018 13:07:56 -0700 Message-Id: <1533067677-22831-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532029854-25830-1-git-send-email-kamal@canonical.com> References: <1532029854-25830-1-git-send-email-kamal@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Kamal Mostafa --- git-build-kernel/git-build-kernel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-build-kernel/git-build-kernel b/git-build-kernel/git-build-kernel index 0d5414a..5b17c48 100755 --- a/git-build-kernel/git-build-kernel +++ b/git-build-kernel/git-build-kernel @@ -68,7 +68,7 @@ GITSHASHORT="`git log -1 --pretty=%h ${GITBRANCH%%refs/heads/} --`" } ### Get the var "DEBIAN=debian.master" from debian/debian.env -eval `git show $GITBRANCH:debian/debian.env | grep DEBIAN=` +eval `git show $GITBRANCH:debian/debian.env 2>&- | grep DEBIAN=` [ -z "$DEBIAN" ] && DEBIAN=debian @@ -84,7 +84,7 @@ SRCPKG=$(git show $GITBRANCH:$DEBIAN/changelog | sed 's/^\(.*\) (.*/\1/;q') CHROOT="$DISTRO" CHROOT="${CHROOT%-proposed}" [ $do_source_pkg = 1 ] && { - eval `git show $GITBRANCH:debian/debian.env | grep SOURCE_PACKAGE_CHROOT=` + eval `git show $GITBRANCH:debian/debian.env 2>&- | grep SOURCE_PACKAGE_CHROOT=` [ -z "$SOURCE_PACKAGE_CHROOT" ] || CHROOT="$SOURCE_PACKAGE_CHROOT" } if [ "$CHROOT" = "UNRELEASED" -o -z "$CHROOT" ] From patchwork Tue Jul 31 20:07:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 951788 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 41g6tx491nz9ryl; Wed, 1 Aug 2018 06:08:09 +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 1fkaw7-0004AA-Us; Tue, 31 Jul 2018 20:08:03 +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 1fkaw5-00049B-JX for kernel-team@lists.ubuntu.com; Tue, 31 Jul 2018 20:08:01 +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 1fkaw5-0001Zb-79 for kernel-team@lists.ubuntu.com; Tue, 31 Jul 2018 20:08:01 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1fkaw2-0005x0-Tx for kernel-team@lists.ubuntu.com; Tue, 31 Jul 2018 13:07:58 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH 6/6] git-build-kernel: special case no .orig tarball for "-signed" src packages Date: Tue, 31 Jul 2018 13:07:57 -0700 Message-Id: <1533067677-22831-2-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533067677-22831-1-git-send-email-kamal@canonical.com> References: <1532029854-25830-1-git-send-email-kamal@canonical.com> <1533067677-22831-1-git-send-email-kamal@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Kamal Mostafa --- git-build-kernel/git-build-kernel | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/git-build-kernel/git-build-kernel b/git-build-kernel/git-build-kernel index 5b17c48..62d2714 100755 --- a/git-build-kernel/git-build-kernel +++ b/git-build-kernel/git-build-kernel @@ -130,10 +130,16 @@ touch "$WORKDIR/building" trap "rm -rf $WORKDIR/building $BUILDDIR" 0 [ $do_source_pkg = 1 ] && { - orig_tarball="${SRCPKG}_${VERSION%%-*}.orig.tar.gz" - # Careful: $ORIG_TARBALLS_DIR must be accessible from within the chroot. - # (Alternately, use "cp -p" instead of "ln -s" if that's not an option) - ln -s $ORIG_TARBALLS_DIR/$orig_tarball $WORKDIR/ + ### HACK Special case for linux-signed, which has no .orig tarball + if [ ${SRCPKG/-signed} != $SRCPKG ] + then + srcpkg_debopts="--no-tgz-check $srcpkg_debopts" + else + orig_tarball="${SRCPKG}_${VERSION%%-*}.orig.tar.gz" + # Careful: $ORIG_TARBALLS_DIR must be accessible from within the chroot. + # (Alternately, use "cp -p" instead of "ln -s" if that's not an option) + ln -s $ORIG_TARBALLS_DIR/$orig_tarball $WORKDIR/ + fi } ### @@ -194,7 +200,7 @@ show_elapsed & fakeroot debian/rules clean if [ $do_source_pkg = 1 ] then - debuild -S -I -i -uc -us $srcpkg_debopts + debuild $srcpkg_debopts -S -I -i -uc -us else debian/rules build fakeroot debian/rules $TARGETS