Merge pull request #2590 from mariux64/update-pciutils-2022.03.14

pciutils: update to 3.7.0.2022.03.14
mariux64 · Mar 14, 2022 · cb22b16 · cb22b16
2 parents 7ae5df0 + b85564e
commit cb22b16
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/pciutils.be0 b/pciutils.be0
@@ -1,8 +1,13 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION pciutils-3.6.3.2020.02.12-0
+# BEE_VERSION pciutils-3.7.0.2022.03.14-0
+
+# PCIURL="http://pci-ids.ucw.cz/v2.2/pci.ids"
+PCIURL="https://beehive.molgen.mpg.de/8e18d260f95f342dc135567357d4c5ac/pci.ids" # 2022.03.14
+
+SRCURL[0]="https://beehive.molgen.mpg.de/e6e20482b4f25c5186e6a753c5edc361/pciutils-3.7.0.tar.xz"
+#SRCURL[0]="https://www.kernel.org/pub/software/utils/pciutils/pciutils-${PKGVERSION[3]}.tar.xz"
 
-SRCURL[0]="https://www.kernel.org/pub/software/utils/pciutils/pciutils-${PKGVERSION[3]}.tar.xz"
 # PATCHURL+=()
 
 # build_in_sourcedir
@@ -14,7 +19,11 @@ SRCURL[0]="https://www.kernel.org/pub/software/utils/pciutils/pciutils-${PKGVERS
 #}
 
 mee_getsources_post() {
-  fetch_one_file "http://pci-ids.ucw.cz/v2.2/pci.ids"
+  mkdir -p ${F}
+  # force reload
+  rm -fv ${F}/pci.ids
+  # fetch_one_file "http://pci-ids.ucw.cz/v2.2/pci.ids"
+  fetch_one_file ${PCIURL}
 }
 
 #mee_patch() {
@@ -36,8 +45,7 @@ mee_install() {
     bee_install install-lib \
       SHAREDIR=${DATAROOTDIR}/hwdata \
       SHARED=yes
-}
-mee_install_post() {
+
    IDS=${D}${DATAROOTDIR}/hwdata/pci.ids
    cp -v ${F}/pci.ids ${IDS}
    grep Version: ${IDS}

diff --git a/scripts/bump-pciutils.sh b/scripts/bump-pciutils.sh
@@ -13,7 +13,7 @@ set -x
 git checkout master
 git pull
 git checkout -B update-pciutils-${RELDATE}
-sed -ri "/^# BEE_VERSION pciutils-3.6.3./ s/2[0-9]{3}.[01][0-9].[0-3][0-9]/${RELDATE}/" pciutils.be0
+sed -ri "/^# BEE_VERSION pciutils-3.7.0./ s/2[0-9]{3}.[01][0-9].[0-3][0-9]/${RELDATE}/" pciutils.be0
 
 eval $(beeversion pciutils.be0)
 set +x