From 4f44220e7d741b9c481dd314560f7ff9a2f1bf1e Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Fri, 15 Aug 2014 23:27:55 -0400 Subject: [PATCH] Remove patch blacklist support No longer necessary since patches are directly integrated into the git repository. --- config/patches.blacklist | 10 ---------- functions/fpkg | 12 +----------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 config/patches.blacklist diff --git a/config/patches.blacklist b/config/patches.blacklist deleted file mode 100644 index 1405aa3..0000000 --- a/config/patches.blacklist +++ /dev/null @@ -1,10 +0,0 @@ -# List of patches that must not be downloaded (one per line) - -make-3.82-upstream_fixes-3.patch -readline-6.2-fixes-1.patch - -# To test eventually... -tar-1.26-manpage-1.patch - -pygobject-2.28.6-introspection-1.patch - diff --git a/functions/fpkg b/functions/fpkg index b4ea48d..e589b90 100644 --- a/functions/fpkg +++ b/functions/fpkg @@ -17,8 +17,6 @@ CLFS_PATCHES_LIST=${LFS_PKG_DIR}/patches-list-clfs.html HV_PATCHES_LIST=${LFS_PKG_DIR}/patches-list-hv.html LFS_OLD_PATCHES_LIST=${LFS_PKG_DIR}/patches-list-lfs-old.html -PATCHES_BLACKLIST=../config/patches.blacklist - # Test if the given file extension correspond to a compressed archive # Arg. #1: File extension is_extension_archive() @@ -258,15 +256,7 @@ static_checkpatch() PATCH_NAME=$(echo ${p} | sed s!%2B!\+!g) if [ ! -f ${LFS_PKG_DIR}/${PATCH_NAME} ]; then - # Fetch patch only if it is not blacklisted! - local BL=$(cat ${PATCHES_BLACKLIST} | \ - egrep "${PATCH_NAME}") - - if [ "x${BL}" == "x" ]; then - wget_wrapper ${PATCHES_URL} ${PATCH_NAME} - else - MSGSTRING="Patch ${PATCH_NAME} blacklisted" print_status warning - fi + wget_wrapper ${PATCHES_URL} ${PATCH_NAME} fi done fi -- 2.20.1