From 5496315388cd4fde25e51848d1bcf2aa3b41e05a Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Thu, 17 Sep 2020 16:18:58 +0200 Subject: [PATCH 1/3] pciutils: update to 3.7.0 - mitigate fetch_one_file race - update --- pciutils.be0 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pciutils.be0 b/pciutils.be0 index caae60953..743421ca4 100755 --- 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.2020.02.12-0 + +PCIURL="https://beehive.molgen.mpg.de/2e95cdfc98e810d03a6c53fa7d8403fb/pci.ids" # 2020.02.12 +#PCIURL="http://pci-ids.ucw.cz/v2.2/pci.ids" + +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,9 @@ 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} +# fetch_one_file "http://pci-ids.ucw.cz/v2.2/pci.ids" + fetch_one_file ${PCIURL} } #mee_patch() { @@ -42,3 +49,4 @@ mee_install_post() { cp -v ${F}/pci.ids ${IDS} grep Version: ${IDS} } + From 9b0eb6990fe3dcb5f41e108ffc242bfcbfef08c5 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Mon, 14 Mar 2022 09:16:47 +0100 Subject: [PATCH 2/3] pciutils: update to 3.7.0.2022.03.14 - be aware of potential output string changes: ``` root:invidia:/scratch/local2/# diff xx.[12] 27c27 < 05:00.0 Serial Attached SCSI controller: Adaptec Smart Storage PQI 12G SAS/PCIe 3 (rev 01) --- > 05:00.0 Serial Attached SCSI controller: Adaptec Smart Storage PQI SAS (rev 01) ``` --- pciutils.be0 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pciutils.be0 b/pciutils.be0 index 743421ca4..da2653fad 100755 --- a/pciutils.be0 +++ b/pciutils.be0 @@ -1,9 +1,9 @@ #!/usr/bin/env beesh -# BEE_VERSION pciutils-3.7.0.2020.02.12-0 +# BEE_VERSION pciutils-3.7.0.2022.03.14-0 -PCIURL="https://beehive.molgen.mpg.de/2e95cdfc98e810d03a6c53fa7d8403fb/pci.ids" # 2020.02.12 -#PCIURL="http://pci-ids.ucw.cz/v2.2/pci.ids" +# 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" @@ -20,7 +20,9 @@ SRCURL[0]="https://beehive.molgen.mpg.de/e6e20482b4f25c5186e6a753c5edc361/pciuti mee_getsources_post() { mkdir -p ${F} -# fetch_one_file "http://pci-ids.ucw.cz/v2.2/pci.ids" + # force reload + rm -fv ${F}/pci.ids + # fetch_one_file "http://pci-ids.ucw.cz/v2.2/pci.ids" fetch_one_file ${PCIURL} } @@ -43,10 +45,8 @@ 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} } - From b85564e2835defc07d9110b72eb3e519969f9169 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Mon, 14 Mar 2022 09:21:24 +0100 Subject: [PATCH 3/3] scripts/bump-pciutils.sh: change version string - pciutils-3.6.3 to 3.7.0 --- scripts/bump-pciutils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bump-pciutils.sh b/scripts/bump-pciutils.sh index 09754c3e1..e4ed95b86 100755 --- 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