From b996d3c2b81d7ec21d29583f6b2b840ea7760bc6 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Tue, 19 Aug 2014 00:04:50 -0400 Subject: [PATCH] Remove download of patches from hugovil.com --- config/urls | 2 -- functions/fpkg | 23 ----------------------- stage0/packages-update | 2 -- stage1/packages-update | 2 -- stage2/packages-update | 2 -- stage3/packages-update | 2 -- stage4/packages-update | 2 -- stage5/packages-update | 2 -- 8 files changed, 37 deletions(-) diff --git a/config/urls b/config/urls index 719d1f2..8e1bb40 100644 --- a/config/urls +++ b/config/urls @@ -9,8 +9,6 @@ HV_BASE_URL="http://www.hugovil.com/repository/hvlinux" LFS_PATCHES_URL="${LFS_BASE_URL}/patches/lfs/development" BLFS_PATCHES_URL="${LFS_BASE_URL}/patches/blfs/svn" CLFS_PATCHES_URL="http://patches.cross-lfs.org/dev" -HV_PATCHES_URL="${HV_BASE_URL}/patches" -LFS_OLD_PATCHES_URL="${HV_BASE_URL}/patches/lfs" LFS_PACKAGES_URL="ftp://ftp.osuosl.org/pub/lfs/lfs-packages/conglomeration" CLFS_PKG_SVN_URL="http://cross-lfs.org/files/packages/svn" diff --git a/functions/fpkg b/functions/fpkg index 829a139..6c0c26e 100644 --- a/functions/fpkg +++ b/functions/fpkg @@ -15,8 +15,6 @@ WGETCMD="wget --directory-prefix=${LFS_PKG_DIR} --timeout=15 --tries=3 -nc --con LFS_PATCHES_LIST=${LFS_PKG_DIR}/patches/list-lfs.html BLFS_PATCHES_LIST=${LFS_PKG_DIR}/patches/list-blfs.html 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 # Test if the given file extension correspond to a compressed archive # Arg. #1: File extension @@ -215,12 +213,6 @@ update_packages_init() rcmd "Fetching LFS patches list" static_fetch_patches_list ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST} fi - if [ -n "${USE_LFS_OLD_PATCHES}" ]; then - # Getting list of all LFS old patches from hugovil.com server. - rcmd "Fetching LFS old patches list" static_fetch_patches_list \ - ${LFS_OLD_PATCHES_URL} ${LFS_OLD_PATCHES_LIST} - fi - if [ -n "${USE_BLFS_PATCHES}" ]; then # Getting list of all patches from BLFS server. rcmd "Fetching BLFS patches list" static_fetch_patches_list ${BLFS_PATCHES_URL} ${BLFS_PATCHES_LIST} @@ -230,11 +222,6 @@ update_packages_init() # Getting list of all patches from CLFS server. rcmd "Fetching CLFS patches list" static_fetch_patches_list ${CLFS_PATCHES_URL} ${CLFS_PATCHES_LIST} fi - - if [ -n "${USE_HV_PATCHES}" ]; then - # Getting list of all patches from hugovil.com server. - rcmd "Fetching hugovil.com patches list" static_fetch_patches_list ${HV_PATCHES_URL} ${HV_PATCHES_LIST} - fi } # Get patch for package if it is not in the repository @@ -291,11 +278,6 @@ static_getpatch() static_checkpatch ${PACK} ${LFS_PATCHES_LIST} ${LFS_PATCHES_URL} fi - if [ -n "${USE_LFS_OLD_PATCHES}" ]; then - # Checking if patch is available from LFS old. - static_checkpatch ${PACK} ${LFS_OLD_PATCHES_LIST} ${LFS_OLD_PATCHES_URL} - fi - if [ -n "${USE_BLFS_PATCHES}" ]; then # Checking if patch is available from BLFS. static_checkpatch ${PACK} ${BLFS_PATCHES_LIST} ${BLFS_PATCHES_URL} @@ -305,11 +287,6 @@ static_getpatch() # Checking if patch is available from CLFS. static_checkpatch ${PACK} ${CLFS_PATCHES_LIST} ${CLFS_PATCHES_URL} fi - - if [ -n "${USE_HV_PATCHES}" ]; then - # Checking if patch is available from hugovil.com. - static_checkpatch ${PACK} ${HV_PATCHES_LIST} ${HV_PATCHES_URL} - fi } detect_file_not_found() diff --git a/stage0/packages-update b/stage0/packages-update index e6e9b0d..a59e8ba 100755 --- a/stage0/packages-update +++ b/stage0/packages-update @@ -1,10 +1,8 @@ #!/bin/bash USE_LFS_PATCHES=1 -USE_LFS_OLD_PATCHES=1 USE_BLFS_PATCHES=1 USE_CLFS_PATCHES=1 -USE_HV_PATCHES=1 source ../functions/main diff --git a/stage1/packages-update b/stage1/packages-update index 2920824..1bfab48 100755 --- a/stage1/packages-update +++ b/stage1/packages-update @@ -1,10 +1,8 @@ #!/bin/bash USE_LFS_PATCHES=1 -USE_LFS_OLD_PATCHES=1 USE_BLFS_PATCHES=1 USE_CLFS_PATCHES=1 -USE_HV_PATCHES=1 source ../functions/main diff --git a/stage2/packages-update b/stage2/packages-update index e2c27f2..bb0ec21 100755 --- a/stage2/packages-update +++ b/stage2/packages-update @@ -1,10 +1,8 @@ #!/bin/bash USE_LFS_PATCHES=1 -USE_LFS_OLD_PATCHES=1 USE_BLFS_PATCHES=1 USE_CLFS_PATCHES=1 -USE_HV_PATCHES=1 source ../functions/main diff --git a/stage3/packages-update b/stage3/packages-update index 7503013..3486bcc 100755 --- a/stage3/packages-update +++ b/stage3/packages-update @@ -1,9 +1,7 @@ #!/bin/bash USE_LFS_PATCHES=1 -USE_LFS_OLD_PATCHES=1 USE_BLFS_PATCHES=1 -USE_HV_PATCHES=1 source ../functions/main diff --git a/stage4/packages-update b/stage4/packages-update index d88a1de..c5af9dc 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -1,9 +1,7 @@ #!/bin/bash USE_LFS_PATCHES=1 -USE_LFS_OLD_PATCHES=1 USE_BLFS_PATCHES=1 -USE_HV_PATCHES=1 source ../functions/main diff --git a/stage5/packages-update b/stage5/packages-update index 0f994c8..3ac98f6 100755 --- a/stage5/packages-update +++ b/stage5/packages-update @@ -1,9 +1,7 @@ #!/bin/bash USE_LFS_PATCHES=1 -USE_LFS_OLD_PATCHES=1 USE_BLFS_PATCHES=1 -USE_HV_PATCHES=1 source ../functions/main -- 2.20.1