mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
TriForceX
16
package/sg3_utils/0001-support-uclinux-as-a-linux.patch
Normal file
16
package/sg3_utils/0001-support-uclinux-as-a-linux.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
Recognise uclinux as a linux
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
diff -durN sg3_utils-1.42.orig/configure.ac sg3_utils-1.42/configure.ac
|
||||
--- sg3_utils-1.42.orig/configure.ac 2015-10-21 01:10:59.000000000 +0200
|
||||
+++ sg3_utils-1.42/configure.ac 2016-08-14 19:30:37.841766149 +0200
|
||||
@@ -71,7 +71,7 @@
|
||||
|
||||
# Define platform-specific symbol.
|
||||
AM_CONDITIONAL(OS_FREEBSD, [echo $host_os | grep 'freebsd' > /dev/null])
|
||||
-AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep '^linux' > /dev/null])
|
||||
+AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep -E '^(uc)?linux' > /dev/null])
|
||||
AM_CONDITIONAL(OS_OSF, [echo $host_os | grep '^osf' > /dev/null])
|
||||
AM_CONDITIONAL(OS_SOLARIS, [echo $host_os | grep '^solaris' > /dev/null])
|
||||
AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null])
|
||||
@@ -0,0 +1,29 @@
|
||||
From 68b0591cf37760e09e358533bbcecf36eddfceed Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sun, 10 Feb 2019 14:46:41 +0100
|
||||
Subject: [PATCH] src/Makefile.am: add missing @RT_LIB@ for sg_turs
|
||||
|
||||
The sg_turs program uses clock_gettime(), so it should link against
|
||||
librt, as provided by @RT_LIB@.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
src/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 881cf29..0eba680 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -170,7 +170,7 @@ sg_test_rwbuf_LDADD = ../lib/libsgutils2.la
|
||||
|
||||
sg_timestamp_LDADD = ../lib/libsgutils2.la
|
||||
|
||||
-sg_turs_LDADD = ../lib/libsgutils2.la
|
||||
+sg_turs_LDADD = ../lib/libsgutils2.la @RT_LIB@
|
||||
|
||||
sg_unmap_LDADD = ../lib/libsgutils2.la
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
18
package/sg3_utils/Config.in
Normal file
18
package/sg3_utils/Config.in
Normal file
@@ -0,0 +1,18 @@
|
||||
config BR2_PACKAGE_SG3_UTILS
|
||||
bool "sg3-utils"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
Low level utilities for devices that use a SCSI command set.
|
||||
This option install only libsgutils2 library not programs.
|
||||
|
||||
http://sg.danny.cz/sg/sg3_utils.html
|
||||
|
||||
if BR2_PACKAGE_SG3_UTILS
|
||||
|
||||
config BR2_PACKAGE_SG3_UTILS_PROGS
|
||||
bool "install programs"
|
||||
|
||||
endif
|
||||
|
||||
comment "sg3-utils needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
6
package/sg3_utils/sg3_utils.hash
Normal file
6
package/sg3_utils/sg3_utils.hash
Normal file
@@ -0,0 +1,6 @@
|
||||
# Locally calculated from download (no sig, hash)
|
||||
sha256 ca94ac106510742cd8ff5ead4a7e5c89d410653291401daf4632d2bef2a35b05 sg3_utils-1.44.tar.xz
|
||||
|
||||
# Hash for license files
|
||||
sha256 d516b8b337a77e3d4c65dffe708ca7fb25b1cb4ec77ec362cf11ed659b9250bc COPYING
|
||||
sha256 31f6d59679e0fb21c9358f22484e6e3c53e20ef08c0950fd38a4a867cb55edc9 BSD_LICENSE
|
||||
54
package/sg3_utils/sg3_utils.mk
Normal file
54
package/sg3_utils/sg3_utils.mk
Normal file
@@ -0,0 +1,54 @@
|
||||
################################################################################
|
||||
#
|
||||
# sg3_utils
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SG3_UTILS_VERSION = 1.44
|
||||
SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz
|
||||
SG3_UTILS_SITE = http://sg.danny.cz/sg/p
|
||||
SG3_UTILS_LICENSE = BSD-3-Clause (library)
|
||||
# Some utils progs are GPL-2.0+ licensed while others are BSD-3-Clause
|
||||
ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y)
|
||||
SG3_UTILS_LICENSE := $(SG3_UTILS_LICENSE), GPL-2.0+ (programs), BSD-3-Clause (programs)
|
||||
endif
|
||||
SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE
|
||||
|
||||
# Patching configure.ac/Makefile.am
|
||||
SG3_UTILS_AUTORECONF = YES
|
||||
|
||||
# install the libsgutils2 library
|
||||
SG3_UTILS_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),)
|
||||
define SG3_UTILS_REMOVE_PROGS
|
||||
for prog in \
|
||||
compare_and_write copy_results dd decode_sense \
|
||||
emc_trespass format get_config \
|
||||
get_lba_status ident inq logs luns map26 \
|
||||
map sgm_dd modes opcodes sgp_dd persist prevent \
|
||||
raw rbuf rdac read readcap read_block_limits \
|
||||
read_attr read_buffer read_long reassign referrals \
|
||||
rep_zones requests reset reset_wp rmsn rtpg safte sanitize \
|
||||
sat_identify sat_phy_event sat_read_gplog sat_set_features \
|
||||
scan senddiag ses ses_microcode start stpg sync test_rwbuf \
|
||||
timestamp turs unmap verify vpd write_buffer write_long \
|
||||
write_same write_verify wr_mode xcopy zone; do \
|
||||
$(RM) $(TARGET_DIR)/usr/bin/sg_$${prog} ; \
|
||||
done
|
||||
for prog in \
|
||||
logging_level mandat readcap ready satl start stop \
|
||||
temperature; do \
|
||||
$(RM) $(TARGET_DIR)/usr/bin/scsi_$${prog} ; \
|
||||
done
|
||||
for prog in \
|
||||
sginfo sgm_dd sgp_dd; do \
|
||||
$(RM) $(TARGET_DIR)/usr/bin/$${prog}; \
|
||||
done
|
||||
endef
|
||||
|
||||
SG3_UTILS_POST_INSTALL_TARGET_HOOKS += SG3_UTILS_REMOVE_PROGS
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
Reference in New Issue
Block a user