From patchwork Thu May 31 16:24:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Alexander Steffens X-Patchwork-Id: 568 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 7CF9347F87B1 for ; Thu, 31 May 2018 16:25:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIM_ADSP_CUSTOM_MED=0.001, DKIM_SIGNED=0.1,FREEMAIL_FROM=0.5,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_MED=-2.3,T_DKIM_INVALID=1 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Thu, 31 May 2018 16:25:42 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id EC996ADE369FF; Thu, 31 May 2018 16:25:35 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Thu, 31 May 2018 16:25:35 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 55BCA2CD01; Thu, 31 May 2018 16:25:33 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Jqf3FlKq Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id E94482C0AF for ; Thu, 31 May 2018 16:25:31 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Thu, 31 May 2018 16:25:31 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id D41F2ADE369EC for ; Thu, 31 May 2018 16:25:30 +0000 (UTC) Received: from mail-wm0-x22e.google.com (mail-wm0-x22e.google.com [IPv6:2a00:1450:400c:c09::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS for ; Thu, 31 May 2018 16:25:30 +0000 (UTC) Received: by mail-wm0-x22e.google.com with SMTP id f6-v6so55087021wmc.4 for ; Thu, 31 May 2018 09:25:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=R15KPwmCZk7hEp1toFLCBfN5pFV8w5AWI0ycpStwm8o=; b=Jqf3FlKqk2vDb/Ezweke6J6ChJYFSOVxzJcKVXNO3AUbsQ9lVsAoSqtBdFw8/4SAUE nhbT2jGBYOTT5Bw2JkbQ++xTVG9l+vHO5EDjad2xU40oT6DRE3Ujl3WPUzpbAFFoa4OR bs5AjrVaQVtQPS3MmK8APCAxp118kHAr9YJEDPFAZPJ3HtVEcioDbbwfsVP+xV1o8Apf tEApdNm4wU6TJHJtt97gd2N3vwqlbiuycNE9EVeuKTD0JGdfsoBJHDhHTsY38Fq1pSMC 2tXGYlrkO1b4NWwyGzBRVrhYoJdO38cgphg4nT2c6dpjbWst88EPNOkvhTBBhHQCjZaj f+zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=R15KPwmCZk7hEp1toFLCBfN5pFV8w5AWI0ycpStwm8o=; b=bXpMmkIylcA68rRvci9bOkRQx8fwMq3Cbr2+MSIgEjXkvL0u0ZnII/Fsl6Hq39A6ed QPomGa+lvNGc8dI4vqgXPb84BI5XP+CIfxvIi/S8pRxxN3CyihWzyHXmpxCOKnpbZvFC T9YD4XVZOoyt6RUNN4p+uRJaGkypTwEazPpV8tpyOOB+2rZ0C4TQ1mDl942O2Onu5fy9 O6SXTIjtt/M8Su/5mA/0jp2yxYo3eqtPxnw4JaNB7bz7hIZ8jO4oHZAPduHLPHz+BLWA XpZk+2VRSv0JVkA31qdrMWPu0JOqsNeokWdGJ76WDlwCarci94n2mcPWbGTZFe2pwnHq 6sBg== X-Gm-Message-State: ALKqPweiuHii3WtXHh5VC/erX4k2S7myimN6SIpuDBmp9i97iu67pXhO PbZreStwTODF6dJGV4GbAcaH7R2p X-Google-Smtp-Source: ADUXVKLy7r8ZpkfysI9SfDNgjW9YqJWeco3x0zwZcoN6BJWV2WqQvLFLRjUJxff4elS6gFSWiG4MXg== X-Received: by 2002:a1c:e846:: with SMTP id f67-v6mr368766wmh.63.1527783930272; Thu, 31 May 2018 09:25:30 -0700 (PDT) Received: from philomeena.fritz.box ([2001:470:6d:88a:6bec:9309:97:97c]) by smtp.gmail.com with ESMTPSA id v196-v6sm1685341wmf.36.2018.05.31.09.25.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 09:25:29 -0700 (PDT) From: "Jan Alexander Steffens (heftig)" To: pacman-dev@archlinux.org Date: Thu, 31 May 2018 18:24:49 +0200 Message-Id: <9de55f68c33fb16eca69053cb21fd640e0ac4a11.1527783895.git.jan.steffens@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: Subject: [pacman-dev] [PATCH 04/10] makepkg: Pull out single-package packaging X-BeenThere: pacman-dev@archlinux.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Discussion list for pacman development Errors-To: pacman-dev-bounces@archlinux.org Sender: "pacman-dev" Put this into a new function close to run_split_packaging so similar code is nearby. --- scripts/makepkg.sh.in | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4684e444..f8f43540 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1121,6 +1121,18 @@ backup_package_variables() { done } +run_solo_packaging() { + pkgdir="$pkgdirbase/$pkgname" + mkdir "$pkgdir" + if (( PKGFUNC )); then + run_package + fi + tidy_install + lint_package || exit $E_PACKAGE_FAILED + create_package + create_debug_package +} + run_split_packaging() { local pkgname_backup=("${pkgname[@]}") local restore_package_variables @@ -1537,15 +1549,7 @@ if (( INFAKEROOT )); then chmod 755 "$pkgdirbase" if (( ! SPLITPKG )); then - pkgdir="$pkgdirbase/$pkgname" - mkdir "$pkgdir" - if (( PKGFUNC )); then - run_package - fi - tidy_install - lint_package || exit $E_PACKAGE_FAILED - create_package - create_debug_package + run_solo_packaging else run_split_packaging fi