From 883c00b3b59bc90ba0806de406c0a5da3f13d5fd Mon Sep 17 00:00:00 2001 From: Zang Ruochen Date: Tue, 17 Mar 2020 10:41:31 +0800 Subject: sdparm: upgrade 1.10 -> 1.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Refresh the following patch: files/make-sysroot-work.patch -License-Update: Copyright year updated to 2019 and removed the following description： * 3. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- .../sdparm/files/make-sysroot-work.patch | 4 ++-- meta-oe/recipes-support/sdparm/sdparm_1.10.bb | 26 ---------------------- meta-oe/recipes-support/sdparm/sdparm_1.11.bb | 26 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 meta-oe/recipes-support/sdparm/sdparm_1.10.bb create mode 100644 meta-oe/recipes-support/sdparm/sdparm_1.11.bb diff --git a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch index 3fd85d9e25..f58091ad7f 100644 --- a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch +++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch @@ -17,13 +17,13 @@ diff --git a/src/Makefile.am b/src/Makefile.am index 61dd9f8..42c911f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -41,7 +41,7 @@ sglib_SOURCES = ../lib/sg_lib.c \ +@@ -53,7 +53,7 @@ sglib_SOURCES = ../lib/sg_lib.c \ ../lib/sg_pt_common.c if HAVE_SGUTILS -INCLUDES = -I/scsi +INCLUDES = -I=@includedir@/scsi - sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@ + sdparm_LDADD = @GETOPT_O_FILES@ @SGUTILS_LIBS@ sdparm_DEPENDENCIES = @GETOPT_O_FILES@ else -- diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb deleted file mode 100644 index c09b495be6..0000000000 --- a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "fetch and change SCSI mode pages" -DESCRIPTION = "The sdparm utility accesses and optionally modifies \ -SCSI devices' mode page and inquiry data." -HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html" -SECTION = "console/utils" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \ - file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed" -DEPENDS="sg3-utils" -SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \ - file://make-sysroot-work.patch \ - " -MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" - -UPSTREAM_CHECK_REGEX = "sdparm-(?P\d+(\.\d+)+)\.tgz" - -PACKAGES =+ "${PN}-scripts" -RDEPENDS_${PN}-scripts += "bash ${PN}" - -SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f" -SRC_URI[sha256sum] = "1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3" - -inherit autotools - -# Put the bash scripts to ${PN}-scripts -FILES_${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp" diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.11.bb b/meta-oe/recipes-support/sdparm/sdparm_1.11.bb new file mode 100644 index 0000000000..7fc87db2bd --- /dev/null +++ b/meta-oe/recipes-support/sdparm/sdparm_1.11.bb @@ -0,0 +1,26 @@ +SUMMARY = "fetch and change SCSI mode pages" +DESCRIPTION = "The sdparm utility accesses and optionally modifies \ +SCSI devices' mode page and inquiry data." +HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html" +SECTION = "console/utils" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \ + file://lib/BSD_LICENSE;md5=12cde17a04c30dece2752f36b7192c64" +DEPENDS="sg3-utils" +SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \ + file://make-sysroot-work.patch \ + " +MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" + +UPSTREAM_CHECK_REGEX = "sdparm-(?P\d+(\.\d+)+)\.tgz" + +PACKAGES =+ "${PN}-scripts" +RDEPENDS_${PN}-scripts += "bash ${PN}" + +SRC_URI[md5sum] = "cd998d1c12a4ec11652d0af580f06b4d" +SRC_URI[sha256sum] = "432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0" + +inherit autotools + +# Put the bash scripts to ${PN}-scripts +FILES_${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp" -- cgit v1.2.3-54-g00ecf