Remove selective patch fetching

diff --git a/functions/fpkg b/functions/fpkg
index b5c06c66fc11f4e448f19caa0d1c868983afaa3d..133b12372e7103f58e99a74ecf7fa87db85a7ef1 100644 (file)
--- 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 5951e96e85c7e6687f9bbde6799c74ffe5f53523..569318d45d025bc9b5a7bf865224439428c29095 100755 (executable)
--- 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 f8e3ffe87e8ea01a8ca2307f66e9d04dca324735..6623452255f673684235a0b39552186c600ebd0a 100755 (executable)
--- 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 1b463f5353868da07076e1de004c80726379b478..d9c6a4a97b9b7f526607b91db03011b5afd98d66 100755 (executable)
--- 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 3486bcc24934e2817a6873d364cdfd14cf4e5e02..e34f31f2eb7aa0860c3c9ddc41852b9ab7f9aac1 100755 (executable)
--- 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 3ea49f4076ea2dfa03572ffe1f7fae5e8b5d4ec9..2e286b9c0332291336d6f05e45c1095b987c4bd5 100755 (executable)
--- 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 83f1a85f8928523ac5c50a88a221b44d6b56c112..2e01e0c4287ec6c82a39219335b3ad57ccb66e82 100755 (executable)
--- 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 ${*}