From: Michael Tremer Date: Fri, 17 Mar 2023 10:03:36 +0000 (+0000) Subject: build: Drop old FHS script X-Git-Tag: 0.9.29~295 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17a985a270dca0d36ce87ab982e82b9740963656;p=pakfire.git build: Drop old FHS script Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index e9b2b2386..1ec548fca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -721,7 +721,6 @@ tests_parser_test_LDADD = \ dist_scripts_SCRIPTS = \ src/scripts/check-buildroot \ - src/scripts/check-fhs \ src/scripts/check-hardening \ src/scripts/check-include \ src/scripts/check-interpreters \ diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c index 66bdbd190..e481ede09 100644 --- a/src/libpakfire/build.c +++ b/src/libpakfire/build.c @@ -1329,7 +1329,6 @@ static const char* post_build_scripts[] = { "check-include", "check-hardening", "check-interpreters", - "check-fhs", "compress-man-pages", "strip", NULL, diff --git a/src/scripts/check-fhs b/src/scripts/check-fhs deleted file mode 100644 index 4ac770395..000000000 --- a/src/scripts/check-fhs +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# Pakfire - The IPFire package management system # -# Copyright (C) 2021 Pakfire 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 3 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 . # -# # -############################################################################### - -error() { - echo "$@" >&2 -} - -main() { - local buildroot="${1}" - shift - - # Check if BUILDROOT exists - if [ ! -d "${buildroot}" ]; then - error "BUILDROOT does not exist" - return 1 - fi - - local illegal_directories=( - "/bin" - "/etc/init.d" - "/etc/rc.d" - "/lib" - "/lib64" - "/lib/pkgconfig" - "/sbin" - "/usr/etc" - "/usr/libexec" - "/usr/local" - "/usr/man" - "/usr/usr" - "/usr/var" - "${buildroot}" - ) - - local r=0 - - local path - for path in "${illegal_directories[@]}"; do - path="${buildroot}${path}" - - if [ -d "${path}" -a ! -L "${path}" ]; then - error "Illegal directory found: ${path/${buildroot}/}" - r=1 - fi - done - - return "${r}" -} - -main "$@" || exit $?