diff --git a/.github/workflows/Generate-PR.yml b/.github/workflows/Generate-PR.yml
index 65cc5c47b..cbc9b0627 100644
--- a/.github/workflows/Generate-PR.yml
+++ b/.github/workflows/Generate-PR.yml
@@ -12,11 +12,6 @@ on:
       pr_title:
         description: "Title of PR"
         required: false
-      update_rebase_to_master:
-        description: "Update Branch."
-        required: false
-        type: boolean
-        default: 'false'
       update_package_files:
         description: "Update Package Files."
         required: false
@@ -85,16 +80,14 @@ jobs:
             echo "Setting ${PR_NUMBER} to Draft while workflow runs."
             gh pr ready --undo || true
           fi
-          if [[ "${{ ( inputs.update_rebase_to_master ) }}" == 'true' ]]; then
-            if [[ -n ${PR_NUMBER} ]]; then
-              # Try to update branch immediately.
-              gh pr update-branch || true
-            else
-              gh pr create -d -b WIP -t "WIP ${{ inputs.branch || github.ref_name }}"
-              # Create a draft PR and immediately try to update the branch
-              # before continuing.
-              gh pr update-branch || true
-            fi
+          if [[ -n ${PR_NUMBER} ]]; then
+            # Try to update branch immediately.
+            gh pr update-branch || true
+          else
+            gh pr create -d -b WIP -t "WIP ${{ inputs.branch || github.ref_name }}"
+            # Create a draft PR and immediately try to update the branch
+            # before continuing.
+            gh pr update-branch || true
           fi
       - name: Get changed files
         id: changed-files
@@ -438,12 +431,14 @@ jobs:
           git config user.email "${{ github.actor }}@users.noreply.github.com"
           git checkout master && git fetch origin master
           git checkout "${{ inputs.branch || github.ref_name }}"
+          git fetch origin "${{ inputs.branch || github.ref_name }}"
           git log --no-merges --oneline -10
           git log --no-merges --oneline master..${{ inputs.branch || github.ref_name }} | grep -v "Merge branch 'master'\|Build Run on\|Package File Update Run on\|lint$" | tr '\n' '\0' | xargs -0 -n1 echo "- $*" >> /tmp/commits.txt
       - name: Get Current HEAD hash
         id: get-current-head
         run: |
           echo "CURRENT_HEAD=$(git ls-remote https://github.com/${{ github.repository }}.git | head -1 | sed 's/HEAD//')" >> "$GITHUB_OUTPUT"
+          echo "CURRENT_HEAD is $(git ls-remote https://github.com/${{ github.repository }}.git | head -1 | sed 's/HEAD//')"
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v47
@@ -558,7 +553,7 @@ jobs:
             gh pr edit --add-reviewer chromebrew/active $PR_EDIT_LABEL_FLAG --title "$(echo "${PR_TITLE}" | sed -e "s/^'//" -e "s/'$//") ${PKG_DELTAS}" -F /tmp/pr.txt
           fi
           # Try to update branch before finishing.
-          [[ "${{ ( inputs.update_rebase_to_master ) }}" == 'true' ]] && gh pr update-branch --rebase || true
+          gh pr update-branch --rebase || true
           # Check to see if the PR is marked as WIP, in which case it should stay as draft.
           if gh pr list -l "wip 🚧" --json number | jq --arg PR_NUMBER "$PR_NUMBER"  -e -r '.[]|select(.number=='$PR_NUMBER')' &>/dev/null; then
             echo "PR ${PR_NUMBER} is set as WIP, so will be set or kept as Draft."
diff --git a/manifest/armv7l/h/hwloc.filelist b/manifest/armv7l/h/hwloc.filelist
index f55d66763..777a43f43 100644
--- a/manifest/armv7l/h/hwloc.filelist
+++ b/manifest/armv7l/h/hwloc.filelist
@@ -1,4 +1,4 @@
-# Total size: 1332731
+# Total size: 1390334
 /usr/local/bin/hwloc-annotate
 /usr/local/bin/hwloc-bind
 /usr/local/bin/hwloc-calc
@@ -44,9 +44,8 @@
 /usr/local/lib/libhwloc.la
 /usr/local/lib/libhwloc.so
 /usr/local/lib/libhwloc.so.15
-/usr/local/lib/libhwloc.so.15.10.0
+/usr/local/lib/libhwloc.so.15.10.1
 /usr/local/lib/pkgconfig/hwloc.pc
-/usr/local/share/applications/lstopo.desktop
 /usr/local/share/bash-completion/completions/hwloc
 /usr/local/share/doc/hwloc/dynamic_SVG_example.html
 /usr/local/share/hwloc/hwloc-dump-hwdata.service
diff --git a/manifest/i686/h/hwloc.filelist b/manifest/i686/h/hwloc.filelist
index cca672993..8a009daf5 100644
--- a/manifest/i686/h/hwloc.filelist
+++ b/manifest/i686/h/hwloc.filelist
@@ -1,3 +1,4 @@
+# Total size: 1606661
 /usr/local/bin/hwloc-annotate
 /usr/local/bin/hwloc-bind
 /usr/local/bin/hwloc-calc
@@ -44,7 +45,7 @@
 /usr/local/lib/libhwloc.la
 /usr/local/lib/libhwloc.so
 /usr/local/lib/libhwloc.so.15
-/usr/local/lib/libhwloc.so.15.5.2
+/usr/local/lib/libhwloc.so.15.10.1
 /usr/local/lib/pkgconfig/hwloc.pc
 /usr/local/sbin/hwloc-dump-hwdata
 /usr/local/share/bash-completion/completions/hwloc
@@ -61,19 +62,19 @@
 /usr/local/share/hwloc/hwloc.dtd
 /usr/local/share/hwloc/hwloc2-diff.dtd
 /usr/local/share/hwloc/hwloc2.dtd
-/usr/local/share/man/man1/hwloc-annotate.1.gz
-/usr/local/share/man/man1/hwloc-bind.1.gz
-/usr/local/share/man/man1/hwloc-calc.1.gz
-/usr/local/share/man/man1/hwloc-compress-dir.1.gz
-/usr/local/share/man/man1/hwloc-diff.1.gz
-/usr/local/share/man/man1/hwloc-distrib.1.gz
-/usr/local/share/man/man1/hwloc-dump-hwdata.1.gz
-/usr/local/share/man/man1/hwloc-gather-cpuid.1.gz
-/usr/local/share/man/man1/hwloc-gather-topology.1.gz
-/usr/local/share/man/man1/hwloc-info.1.gz
-/usr/local/share/man/man1/hwloc-ls.1.gz
-/usr/local/share/man/man1/hwloc-patch.1.gz
-/usr/local/share/man/man1/hwloc-ps.1.gz
-/usr/local/share/man/man1/lstopo-no-graphics.1.gz
-/usr/local/share/man/man1/lstopo.1.gz
-/usr/local/share/man/man7/hwloc.7.gz
+/usr/local/share/man/man1/hwloc-annotate.1.zst
+/usr/local/share/man/man1/hwloc-bind.1.zst
+/usr/local/share/man/man1/hwloc-calc.1.zst
+/usr/local/share/man/man1/hwloc-compress-dir.1.zst
+/usr/local/share/man/man1/hwloc-diff.1.zst
+/usr/local/share/man/man1/hwloc-distrib.1.zst
+/usr/local/share/man/man1/hwloc-dump-hwdata.1.zst
+/usr/local/share/man/man1/hwloc-gather-cpuid.1.zst
+/usr/local/share/man/man1/hwloc-gather-topology.1.zst
+/usr/local/share/man/man1/hwloc-info.1.zst
+/usr/local/share/man/man1/hwloc-ls.1.zst
+/usr/local/share/man/man1/hwloc-patch.1.zst
+/usr/local/share/man/man1/hwloc-ps.1.zst
+/usr/local/share/man/man1/lstopo-no-graphics.1.zst
+/usr/local/share/man/man1/lstopo.1.zst
+/usr/local/share/man/man7/hwloc.7.zst
diff --git a/manifest/x86_64/h/hwloc.filelist b/manifest/x86_64/h/hwloc.filelist
index 8dadc597d..bff14fcc9 100644
--- a/manifest/x86_64/h/hwloc.filelist
+++ b/manifest/x86_64/h/hwloc.filelist
@@ -1,4 +1,4 @@
-# Total size: 1685788
+# Total size: 1518083
 /usr/local/bin/hwloc-annotate
 /usr/local/bin/hwloc-bind
 /usr/local/bin/hwloc-calc
@@ -45,10 +45,9 @@
 /usr/local/lib64/libhwloc.la
 /usr/local/lib64/libhwloc.so
 /usr/local/lib64/libhwloc.so.15
-/usr/local/lib64/libhwloc.so.15.10.0
+/usr/local/lib64/libhwloc.so.15.10.1
 /usr/local/lib64/pkgconfig/hwloc.pc
 /usr/local/sbin/hwloc-dump-hwdata
-/usr/local/share/applications/lstopo.desktop
 /usr/local/share/bash-completion/completions/hwloc
 /usr/local/share/doc/hwloc/dynamic_SVG_example.html
 /usr/local/share/hwloc/hwloc-dump-hwdata.service
diff --git a/packages/hwloc.rb b/packages/hwloc.rb
index a3141d353..fa89af5fd 100644
--- a/packages/hwloc.rb
+++ b/packages/hwloc.rb
@@ -1,37 +1,27 @@
-# Adapted from Arch Linux hwloc PKGBUILD at:
-# https://github.com/archlinux/svntogit-packages/raw/packages/hwloc/trunk/PKGBUILD
-
 require 'buildsystems/autotools'
 
 class Hwloc < Autotools
   description 'Portable Hardware Locality is a portable abstraction of hierarchical architectures'
   homepage 'https://www.open-mpi.org/projects/hwloc/'
-  version '2.12.1'
+  version '2.12.2'
   license 'BSD-3 Clause'
-  compatibility 'aarch64 armv7l x86_64'
+  compatibility 'all'
   source_url 'https://github.com/open-mpi/hwloc.git'
   git_hashtag "hwloc-#{version}"
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: '9eb5e5de24efc07604a7d1afcf6de7856c3ab10724456ba0699dc13e96fbb7b8',
-     armv7l: '9eb5e5de24efc07604a7d1afcf6de7856c3ab10724456ba0699dc13e96fbb7b8',
-     x86_64: '6809fd917519e0f9be4e3fc9d6a8f1e67da8ff80f6576d9ca2844a5599d6812c'
+    aarch64: '7d8f78b18bcf6f90d795c2f430619c8aa41eb592796f35bf1121b72cfa96f825',
+     armv7l: '7d8f78b18bcf6f90d795c2f430619c8aa41eb592796f35bf1121b72cfa96f825',
+       i686: '829511bc563726fd616770ab823e70b3e5b616beccf19bfc0fa9c391d87676e3',
+     x86_64: 'a196c04d6f1f817d8a42153cffbc14212888385756bdcfc682bc1c44a37cb116'
   })
 
-  depends_on 'cairo' # R
   depends_on 'eudev' # R
-  depends_on 'harfbuzz' # R
-  depends_on 'libbsd' # R
-  depends_on 'libmd' # R
+  depends_on 'glibc' # R
   depends_on 'libpciaccess' # R
-  depends_on 'libx11' # R
-  depends_on 'libxau' # R
-  depends_on 'libxcb' # R
-  depends_on 'libxdmcp' # R
   depends_on 'libxml2' # R
   depends_on 'pciutils' => :build
 
-  autotools_configure_options "--enable-plugins \
-    --sysconfdir=#{CREW_PREFIX}/etc"
+  autotools_configure_options '--disable-cairo --enable-plugins'
 end