From patchwork Sat Mar 12 22:52:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gregory X-Patchwork-Id: 2050 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.28) for (single-drop); Sat, 12 Mar 2022 22:53:58 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id cI0ILIUkLWIJ6QIAK+/4rw (envelope-from ) for ; Sat, 12 Mar 2022 22:53:57 +0000 Received: from lists.archlinux.org (lists.archlinux.org [IPv6:2a01:4f9:c010:9eb4::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 990FBDE3964; Sat, 12 Mar 2022 22:53:56 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 700CADD96EF; Sat, 12 Mar 2022 22:53:55 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lists.archlinux.org (Postfix) with ESMTPS id 1E5FFDD96DE for ; Sat, 12 Mar 2022 22:53:54 +0000 (UTC) Received: by mail-pf1-x42d.google.com with SMTP id s42so11089452pfg.0 for ; Sat, 12 Mar 2022 14:53:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=szJHK8Sty97qv6GV1tliTvIIQVEnNA11OdEFGKf0U4I=; b=iLn1oSKZyX0699Kalb005vcpxcsX+tAvprSaVQr0sGlSjctJ1ZYVcnk8L05lTMDmPm jStZsdMot7/Wp8OGAbhYVWbFMA3g9+ffcFBHPXdqKoNt/8WT0MSET+v6AQyRMexfFGs6 xwBHiRPnRVa7yePu6jf4H7pnMXgkOby+Mue5ludBgS46MBVfT4VmRDfGDAMTzZmTmrcj g71xRAfw9dRs2p1ml3z3B/iyCasf+2qyDLWn49ao3GbhYLfwVH1sb8K+Ha2IiNwHygNY v61xyX2lroO2xGH5Pmo3waTNMgoBmH2W1jjh5EEpFeWdhZsSR+yfxD0nP2fLU2BhhbyD tqmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=szJHK8Sty97qv6GV1tliTvIIQVEnNA11OdEFGKf0U4I=; b=io2qGs9wjpfSNwNh3dBfrc9lAEQfB1EqN3hNQ6sKEaHrra3p8vgDOU3WscI1Vh5+Pz FswcyFUbFyaSKK3uJxBURvGGa4vuI45P5ZU0H+VBTch9bnKawpfGxQr2Cy224rRCUBI7 SqdUi5F7msdG2JCG9Ev+ESxfz4Cv7MR7IWz0It+PNz7PZn/o76K/VCAg1slx3tsqCdXp ToJuFutBPMCWIQbts+CR3lQYnEazJl5nHh03gFVgn2LGj7AGunQFrvX8WWSE5DvO1CWc +mZOtHV5wxD9LgFx5RVfnwL3Vie2i2seNmwbLjkpXw7xOqGDpTmkoX0bEFke6YNs3Xrw P+yA== X-Gm-Message-State: AOAM532f6kQpUnrubLvuhEYna1KRvHAzRq97N3H5QX0cLE2SuC5ZpYo3 nVWx9+5uyHbLu7AGbGqSoUqR/OaJo0E= X-Google-Smtp-Source: ABdhPJxjxKJg5AOtVo2n3IhGIxOhrJsmjJThJ4RvgImooUZl/RZg93gMBI5kS1Xi4P1MmxWt3zXQzw== X-Received: by 2002:a63:2bc1:0:b0:35e:c54b:3be0 with SMTP id r184-20020a632bc1000000b0035ec54b3be0mr14199513pgr.105.1647125632093; Sat, 12 Mar 2022 14:53:52 -0800 (PST) Received: from localhost.localdomain ([98.47.65.14]) by smtp.gmail.com with ESMTPSA id k11-20020a056a00134b00b004f7bc05c676sm694417pfu.197.2022.03.12.14.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Mar 2022 14:53:51 -0800 (PST) From: Andrew Gregory To: pacman-dev@lists.archlinux.org Cc: Andrew Gregory Subject: [PATCH v2 3/3] makepkg: store pkgtype in xdata Date: Sat, 12 Mar 2022 14:52:53 -0800 Message-Id: <20220312225253.205609-4-andrew.gregory.8@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220312225253.205609-1-andrew.gregory.8@gmail.com> References: <20220206183041.104788-1-andrew.gregory.8@gmail.com> <20220312225253.205609-1-andrew.gregory.8@gmail.com> MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" X-Spamd-Result: default: False [-1.41 / 15.00]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; R_MISSING_CHARSET(0.50)[]; MAILLIST(-0.20)[mailman]; RCVD_IN_DNSWL_MED(-0.20)[2a01:4f9:c010:9eb4::1:from]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f9:c010:9eb4::1:c]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; FROM_HAS_DN(0.00)[]; FROM_NEQ_ENVFROM(0.00)[andrewgregory8@gmail.com,pacman-dev-bounces@lists.archlinux.org]; TAGGED_RCPT(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; NEURAL_HAM(-0.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::42d:received]; RCVD_COUNT_FIVE(0.00)[5]; RCVD_VIA_SMTP_AUTH(0.00)[]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[gmail.com]; ASN(0.00)[asn:24940, ipnet:2a01:4f9::/32, country:DE]; FORGED_SENDER_MAILLIST(0.00)[] Authentication-Results: mail.archlinux.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=iLn1oSKZ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 2a01:4f9:c010:9eb4::1 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 990FBDE3964 X-Rspamd-Server: mail.archlinux.org Package type is not relevant to alpm or even exposed to front-ends in any way. Signed-off-by: Andrew Gregory --- lib/libalpm/be_package.c | 2 -- scripts/makepkg.sh.in | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index b4f3f1c26..bedec723e 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -244,8 +244,6 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * CALLOC(backup, 1, sizeof(alpm_backup_t), return -1); STRDUP(backup->name, ptr, FREE(backup); return -1); newpkg->backup = alpm_list_add(newpkg->backup, backup); - } else if(strcmp(key, "pkgtype") == 0) { - /* not used atm */ } else if(strcmp(key, "xdata") == 0) { alpm_pkg_xdata_t *pd = _alpm_pkg_parse_xdata(ptr); if(pd == NULL || !alpm_list_append(&newpkg->xdata, pd)) { diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5aaabf633..9d3ae3cd5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -487,7 +487,7 @@ write_pkginfo() { write_kv_pair "pkgname" "$pkgname" write_kv_pair "pkgbase" "$pkgbase" - write_kv_pair "pkgtype" "$pkgtype" + write_kv_pair "xdata" "pkgtype=$pkgtype" local fullver=$(get_full_version) write_kv_pair "pkgver" "$fullver"