From patchwork Thu Aug 2 22:40:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 952992 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 41hQBC291Wz9sBy; Fri, 3 Aug 2018 08:40:51 +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 1flMGu-0000up-GG; Thu, 02 Aug 2018 22:40:40 +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 1flMGt-0000uH-5n for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:39 +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 1flMGs-000541-QM for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:38 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1flMGq-0002Tn-Kw for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 15:40:36 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH v2 1/7] git-build-kernel: extract the correct source package name Date: Thu, 2 Aug 2018 15:40:29 -0700 Message-Id: <1533249635-9483-2-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533249635-9483-1-git-send-email-kamal@canonical.com> References: <1533249635-9483-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 Aug 2 22:40:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 952991 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 41hQBC00B8z9s8W; Fri, 3 Aug 2018 08:40:50 +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 1flMGx-0000w0-OO; Thu, 02 Aug 2018 22:40:43 +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 1flMGt-0000uT-P4 for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:39 +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 1flMGt-000542-Cy for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:39 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1flMGr-0002Tr-8E for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 15:40:37 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH v2 2/7] git-build-kernel: improve results summary for source packages Date: Thu, 2 Aug 2018 15:40:30 -0700 Message-Id: <1533249635-9483-3-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533249635-9483-1-git-send-email-kamal@canonical.com> References: <1533249635-9483-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 Aug 2 22:40:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 952989 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 41hQBC0spKz9sBs; Fri, 3 Aug 2018 08:40:50 +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 1flMGx-0000wI-Ti; Thu, 02 Aug 2018 22:40:43 +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 1flMGu-0000uz-W4 for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:40 +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 1flMGu-00054C-Jz for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:40 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1flMGs-0002U2-F4 for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 15:40:38 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH v2 4/7] git-build-kernel: debuild source packages with suitable -vversion Date: Thu, 2 Aug 2018 15:40:32 -0700 Message-Id: <1533249635-9483-5-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533249635-9483-1-git-send-email-kamal@canonical.com> References: <1533249635-9483-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" Determine latest released package version in -updates and supply it to dpkg-genchanges via debuild -vversion. Special case: If rmadison reports that the version published in -updates is the same or newer than the source package version being built, then just do not pass any -v to debuild. dpkg-genchanges does actually detect such out-of-order versions but misbehaves if the updates_version doesn't exist in the changelog at all (as with our derivative kernels). This situation only occurs when test-building source packages which have already been published; the resulting source package could not be re-uploaded anyway, so the contents of _source.changes are not critical. Signed-off-by: Kamal Mostafa --- git-build-kernel/git-build-kernel | 40 ++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/git-build-kernel/git-build-kernel b/git-build-kernel/git-build-kernel index cfad062..a683ad4 100755 --- a/git-build-kernel/git-build-kernel +++ b/git-build-kernel/git-build-kernel @@ -95,6 +95,31 @@ then CHROOT="${CHROOT%.git}" fi +### Get the source package version number +chg="`git show $GITBRANCH:$DEBIAN/changelog | head -1`" +VERSION=`echo "$chg" | sed -n -e '1s/^.*(\([^)]*\)).*$/\1/p'` + +### Find the appropriate -v{version} value for dpkg-genchanges +[ $do_source_pkg = 1 ] && { + updates_version=$(rmadison -s ${DISTRO}-updates $SRCPKG | grep 'source$' | awk '{print $3}') + if [ -n "$updates_version" ] + then + dpkg --compare-versions "$updates_version" ge $VERSION && { + echo "WARNING: ${DISTRO}-updates version ($updates_version) >= this version; skipping -v!" 1>&2 + updates_version="" + } + else + echo "WARNING: cannot determine ${DISTRO}-updates version for $SRCPKG" 1>&2 + fi + if [ -n "$updates_version" ] + then + ### Special case for backport kernel versions: strip the e.g. "~16.04.1" + ### suffix from the updates_version + updates_version="${updates_version%~*}" + srcpkg_debopts="-v$updates_version $srcpkg_debopts" + fi +} + ### Compile amd64 and i386 in a native chroot. ### Cross-compile ARM in an amd64 chroot (for dramatically better performance). if [ "$ARCH" = "amd64" -o "$ARCH" = "i386" ] @@ -104,10 +129,6 @@ else CHROOT="$CHROOT-amd64" fi -### Get the version number - we need it to locate the orig tarball -chg="`git show $GITBRANCH:$DEBIAN/changelog | head -1`" -VERSION=`echo "$chg" | sed -n -e '1s/^.*(\([^)]*\)).*$/\1/p'` - ### Set up the /tmp work directory @@ -138,7 +159,12 @@ trap "rm -rf $WORKDIR/building $BUILDDIR" 0 echo "git-build-kernel" echo " package: $SRCPKG ($VERSION) $DISTRO" echo " targets: $TARGETS" -echo " arch: $ARCH" +if [ $do_source_pkg = 1 ] +then + echo " changes-v: $updates_version" +else + echo " arch: $ARCH" +fi echo " chroot: $CHROOT" echo " starting build in $HOSTNAME:$WORKDIR ..." @@ -180,7 +206,7 @@ show_elapsed & fakeroot debian/rules clean if [ $do_source_pkg = 1 ] then - debuild -S -I -i -uc -us + debuild $srcpkg_debopts -S -I -i -uc -us else debian/rules build fakeroot debian/rules $TARGETS @@ -194,7 +220,7 @@ XXEOFXX fakeroot debian/rules clean if [ $do_source_pkg = 1 ] then - debuild -S -I -i -uc -us + debuild $srcpkg_debopts -S -I -i -uc -us else debian/rules build fakeroot debian/rules $TARGETS From patchwork Thu Aug 2 22:40:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 952986 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 41hQBB6ffFz9s7c; Fri, 3 Aug 2018 08:40:50 +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 1flMGy-0000wU-2W; Thu, 02 Aug 2018 22:40:44 +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 1flMGw-0000vT-7Q for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:42 +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 1flMGv-00054G-Re for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:42 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1flMGt-0002U7-2F for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 15:40:39 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH v2 5/7] git-build-kernel: squelch output noise when there is no debian/debian.env Date: Thu, 2 Aug 2018 15:40:33 -0700 Message-Id: <1533249635-9483-6-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533249635-9483-1-git-send-email-kamal@canonical.com> References: <1533249635-9483-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 a683ad4..3c19587 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 Thu Aug 2 22:40:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 952990 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 41hQBC0Rrxz9s9l; Fri, 3 Aug 2018 08:40:50 +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 1flMGy-0000wq-7Z; Thu, 02 Aug 2018 22:40:44 +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 1flMGw-0000vU-8X for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:42 +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 1flMGv-00054O-Sr for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:42 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1flMGt-0002UC-M7 for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 15:40:39 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH v2 6/7] git-build-kernel: special case no-orig-tarball src packages Date: Thu, 2 Aug 2018 15:40:34 -0700 Message-Id: <1533249635-9483-7-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533249635-9483-1-git-send-email-kamal@canonical.com> References: <1533249635-9483-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" The "meta" and "signed" source packages do not use an orig tarball, so do not try to symlink to one, and do use --no-tgz-check to inhibit checking for one (the latter is explicitly required just for "signed" since its non-Debian-native version number implies that there will be a orig tarball). Signed-off-by: Kamal Mostafa --- git-build-kernel/git-build-kernel | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/git-build-kernel/git-build-kernel b/git-build-kernel/git-build-kernel index 3c19587..02994db 100755 --- a/git-build-kernel/git-build-kernel +++ b/git-build-kernel/git-build-kernel @@ -142,10 +142,23 @@ 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/ + ### 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 ] + 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) + [ -e "$ORIG_TARBALLS_DIR/$orig_tarball" ] || { + echo "fatal: missing $ORIG_TARBALLS_DIR/$orig_tarball" 1>&2 + exit 1 + } + ln -s $ORIG_TARBALLS_DIR/$orig_tarball $WORKDIR/ + fi } ### From patchwork Thu Aug 2 22:40:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 952987 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 41hQBC0cl4z9sBZ; Fri, 3 Aug 2018 08:40:50 +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 1flMGy-0000x5-EU; Thu, 02 Aug 2018 22:40:44 +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 1flMGw-0000vf-Rb for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:42 +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 1flMGw-00054U-F6 for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 22:40:42 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1flMGu-0002UH-9q for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 15:40:40 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH v2 7/7] git-build-kernel: add README notes about meta and signed Date: Thu, 2 Aug 2018 15:40:35 -0700 Message-Id: <1533249635-9483-8-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533249635-9483-1-git-send-email-kamal@canonical.com> References: <1533249635-9483-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/README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/git-build-kernel/README b/git-build-kernel/README index 875ffb9..ab2b8f7 100644 --- a/git-build-kernel/README +++ b/git-build-kernel/README @@ -85,6 +85,10 @@ To set up your git push auto-builder (Do that for each ubuntu-* repo that you'll want to push to). (Works fine for repo dir's named "ubuntu-something.git" also). + For the small repos like -meta or -signed, you need not bother setting + up a specific builder repo at all. For each of those, just add a remote + (as below) to the main kernel repo on your build server. + 2. On your local machine, if you haven't already, set up a git remote to point to your repo on the build server, e.g: