From fe6e678e591d0938c8b23d83f1a3ea805a4becba Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 2 Aug 2025 14:26:44 +1000 Subject: [PATCH] libmakepkg: remove pkglist linting The ability to build only selected packages from a split package was removed from makepkg, so this lint is no longer needed. Signed-off-by: Allan McRae --- scripts/libmakepkg/lint_pkgbuild/meson.build | 1 - .../libmakepkg/lint_pkgbuild/pkglist.sh.in | 44 ------------------- 2 files changed, 45 deletions(-) delete mode 100644 scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in diff --git a/scripts/libmakepkg/lint_pkgbuild/meson.build b/scripts/libmakepkg/lint_pkgbuild/meson.build index a0bc2f31..a22142d1 100644 --- a/scripts/libmakepkg/lint_pkgbuild/meson.build +++ b/scripts/libmakepkg/lint_pkgbuild/meson.build @@ -17,7 +17,6 @@ sources = [ 'package_function.sh.in', 'package_function_variable.sh.in', 'pkgbase.sh.in', - 'pkglist.sh.in', 'pkgname.sh.in', 'pkgrel.sh.in', 'pkgver.sh.in', diff --git a/scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in deleted file mode 100644 index 8273681d..00000000 --- a/scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# pkglist.sh - Check the packages selected to build exist. -# -# Copyright (c) 2014-2025 Pacman Development Team -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGLIST_SH" ]] && return -LIBMAKEPKG_LINT_PKGBUILD_PKGLIST_SH=1 - -MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'} - -source "$MAKEPKG_LIBRARY/util/message.sh" -source "$MAKEPKG_LIBRARY/util/util.sh" - - -lint_pkgbuild_functions+=('lint_pkglist') - - -lint_pkglist() { - local i ret=0 - - for i in "${PKGLIST[@]}"; do - if ! in_array "$i" "${pkgname[@]}"; then - error "$(gettext "Requested package %s is not provided in %s")" "$i" "$BUILDFILE" - ret=1 - fi - done - - return $ret -}