From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sat, 6 Dec 2014 04:06:35 +0000 (-0500)
Subject: Remove selective patch fetching
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=91225b782d7c0309719e45df4c603e52d28d96d3;p=hvlinux.git

Remove selective patch fetching
---

diff --git a/functions/fpkg b/functions/fpkg
index b5c06c6..133b123 100644
--- a/functions/fpkg
+++ b/functions/fpkg
@@ -216,29 +216,23 @@ update_packages_init()
 	return 1
     fi
 
-    if [ -n "${USE_LFS_PATCHES}" ]; then
-        # Getting list of all patches from LFS server.
-        set +e
-        rcmd "Fetching LFS  patches list" static_fetch_patches_list \
-            ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST}
-        set -e
-    fi
+    # Temporary deactivate error checking.
+    set +e
 
-    if [ -n "${USE_BLFS_PATCHES}" ]; then
-        # Getting list of all patches from BLFS server.
-        set +e
-        rcmd "Fetching BLFS patches list" static_fetch_patches_list \
-            ${BLFS_PATCHES_URL} ${BLFS_PATCHES_LIST}
-        set -e
-    fi
+    # Getting list of all patches from LFS server.
+    rcmd "Fetching LFS  patches list" static_fetch_patches_list \
+        ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST}
 
-    if [ -n "${USE_CLFS_PATCHES}" ]; then
-        # Getting list of all patches from CLFS server.
-        set +e
-        rcmd "Fetching CLFS patches list" static_fetch_patches_list \
-            ${CLFS_PATCHES_URL} ${CLFS_PATCHES_LIST}
-        set -e
-    fi
+    # Getting list of all patches from BLFS server.
+    rcmd "Fetching BLFS patches list" static_fetch_patches_list \
+        ${BLFS_PATCHES_URL} ${BLFS_PATCHES_LIST}
+
+    # Getting list of all patches from CLFS server.
+    rcmd "Fetching CLFS patches list" static_fetch_patches_list \
+        ${CLFS_PATCHES_URL} ${CLFS_PATCHES_LIST}
+
+    # Reactivate error checking.
+    set -e
 }
 
 # Get patch for package if it is not in the repository
@@ -295,20 +289,14 @@ static_getpatch()
 	return 1
     fi
 
-    if [ -n "${USE_LFS_PATCHES}" ]; then
-        # Checking if patch is available from LFS.
-        static_checkpatch ${PACK} ${LFS_PATCHES_LIST} ${LFS_PATCHES_URL}
-    fi
+    # Checking if patch is available from LFS.
+    static_checkpatch ${PACK} ${LFS_PATCHES_LIST} ${LFS_PATCHES_URL}
 
-    if [ -n "${USE_BLFS_PATCHES}" ]; then
-        # Checking if patch is available from BLFS.
-        static_checkpatch ${PACK} ${BLFS_PATCHES_LIST} ${BLFS_PATCHES_URL}
-    fi
+    # Checking if patch is available from BLFS.
+    static_checkpatch ${PACK} ${BLFS_PATCHES_LIST} ${BLFS_PATCHES_URL}
 
-    if [ -n "${USE_CLFS_PATCHES}" ]; then
-        # Checking if patch is available from CLFS.
-        static_checkpatch ${PACK} ${CLFS_PATCHES_LIST} ${CLFS_PATCHES_URL}
-    fi
+    # Checking if patch is available from CLFS.
+    static_checkpatch ${PACK} ${CLFS_PATCHES_LIST} ${CLFS_PATCHES_URL}
 }
 
 detect_file_not_found()
diff --git a/stage0/packages-update b/stage0/packages-update
index 5951e96..569318d 100755
--- a/stage0/packages-update
+++ b/stage0/packages-update
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-USE_LFS_PATCHES=1
-USE_BLFS_PATCHES=1
-USE_CLFS_PATCHES=1
-
 source ../functions/main
 
 update_packages_init ${*}
diff --git a/stage1/packages-update b/stage1/packages-update
index f8e3ffe..6623452 100755
--- a/stage1/packages-update
+++ b/stage1/packages-update
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-USE_LFS_PATCHES=1
-USE_BLFS_PATCHES=1
-USE_CLFS_PATCHES=1
-
 source ../functions/main
 
 update_packages_init ${*}
diff --git a/stage2/packages-update b/stage2/packages-update
index 1b463f5..d9c6a4a 100755
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-USE_LFS_PATCHES=1
-USE_BLFS_PATCHES=1
-USE_CLFS_PATCHES=1
-
 source ../functions/main
 
 update_packages_init ${*}
diff --git a/stage3/packages-update b/stage3/packages-update
index 3486bcc..e34f31f 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-USE_LFS_PATCHES=1
-USE_BLFS_PATCHES=1
-
 source ../functions/main
 
 update_packages_init ${*}
diff --git a/stage4/packages-update b/stage4/packages-update
index 3ea49f4..2e286b9 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-USE_LFS_PATCHES=1
-USE_BLFS_PATCHES=1
-
 source ../functions/main
 
 update_packages_init ${*}
diff --git a/stage5/packages-update b/stage5/packages-update
index 83f1a85..2e01e0c 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-USE_LFS_PATCHES=1
-USE_BLFS_PATCHES=1
-
 source ../functions/main
 
 update_packages_init ${*}