From 6d0edf341b7879eb941e3e3f287a5fb065a08f70 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Tue, 10 Mar 2015 15:06:59 +0100 Subject: [PATCH] system/i2c-tools: Updated for version 3.1.1. Signed-off-by: Matteo Bernardini --- system/i2c-tools/i2c-tools.SlackBuild | 7 +- system/i2c-tools/i2c-tools.info | 6 +- system/i2c-tools/patches/changeset_r6063.diff | 42 ------ system/i2c-tools/patches/changeset_r6069.diff | 129 ------------------ 4 files changed, 5 insertions(+), 179 deletions(-) delete mode 100644 system/i2c-tools/patches/changeset_r6063.diff delete mode 100644 system/i2c-tools/patches/changeset_r6069.diff diff --git a/system/i2c-tools/i2c-tools.SlackBuild b/system/i2c-tools/i2c-tools.SlackBuild index c1464608f7..cceab1381a 100644 --- a/system/i2c-tools/i2c-tools.SlackBuild +++ b/system/i2c-tools/i2c-tools.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for i2c-tools -# Copyright Matteo Bernardini , 2012 +# Copyright 2012-2015 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=i2c-tools -VERSION=${VERSION:-3.1.0} +VERSION=${VERSION:-3.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,9 +70,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Recommended patches -for i in $CWD/patches/* ; do patch -p3 -i $i ; done - sed -i \ -e "s|/local||" \ -e "s|-O2|${SLKCFLAGS}|" \ diff --git a/system/i2c-tools/i2c-tools.info b/system/i2c-tools/i2c-tools.info index 921b7e4269..35f1b998ab 100644 --- a/system/i2c-tools/i2c-tools.info +++ b/system/i2c-tools/i2c-tools.info @@ -1,8 +1,8 @@ PRGNAM="i2c-tools" -VERSION="3.1.0" +VERSION="3.1.1" HOMEPAGE="http://lm-sensors.org/wiki/I2CTools" -DOWNLOAD="http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.1.0.tar.bz2" -MD5SUM="f15019e559e378c6e9d5d6299a00df21" +DOWNLOAD="http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.1.1.tar.bz2" +MD5SUM="0fdbff53ebd0b8d9249256d6c56480b1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/i2c-tools/patches/changeset_r6063.diff b/system/i2c-tools/patches/changeset_r6063.diff deleted file mode 100644 index f6f83e7a0d..0000000000 --- a/system/i2c-tools/patches/changeset_r6063.diff +++ /dev/null @@ -1,42 +0,0 @@ -Index: /i2c-tools/branches/i2c-tools-3.1/eeprom/decode-dimms -=================================================================== ---- /branches/i2c-tools-3.1/eeprom/decode-dimms (revision 6043) -+++ /branches/i2c-tools-3.1/eeprom/decode-dimms (revision 6063) -@@ -1740,5 +1740,5 @@ - sub get_dimm_list - { -- my (@dirs, $dir, $file, @files); -+ my (@dirs, $dir, $opened, $file, @files); - - if ($use_sysfs) { -@@ -1750,4 +1750,5 @@ - foreach $dir (@dirs) { - next unless opendir(local *DIR, $dir); -+ $opened++; - while (defined($file = readdir(DIR))) { - if ($use_sysfs) { -@@ -1770,10 +1771,10 @@ - } - -- if (@files) { -- return sort { $a->{file} cmp $b->{file} } @files; -- } elsif (! -d '/sys/module/eeprom') { -- print "No EEPROM found, are you sure the eeprom module is loaded?\n"; -+ if (!$opened) { -+ print STDERR "No EEPROM found, try loading the eeprom or at24 module\n"; - exit; - } -+ -+ return sort { $a->{file} cmp $b->{file} } @files; - } - -Index: /i2c-tools/branches/i2c-tools-3.1/CHANGES -=================================================================== ---- /branches/i2c-tools-3.1/CHANGES (revision 6048) -+++ /branches/i2c-tools-3.1/CHANGES (revision 6063) -@@ -5,4 +5,5 @@ - decode-dimms: Decode module configuration type of DDR2 SDRAM - Decode bus width extension of DDR3 SDRAM -+ Don't choke when no EEPROM is found - i2c-dev.h: Minimize differences with kernel flavor - Move SMBus helper functions to include/i2c/smbus.h diff --git a/system/i2c-tools/patches/changeset_r6069.diff b/system/i2c-tools/patches/changeset_r6069.diff deleted file mode 100644 index c89f2ae6d4..0000000000 --- a/system/i2c-tools/patches/changeset_r6069.diff +++ /dev/null @@ -1,129 +0,0 @@ -Index: /i2c-tools/trunk/eeprom/decode-dimms -=================================================================== ---- /i2c-tools/trunk/eeprom/decode-dimms (revision 6068) -+++ /i2c-tools/trunk/eeprom/decode-dimms (revision 6069) -@@ -65,9 +65,9 @@ - "Tristar", "Visic", "Intl. CMOS Technology", "SSSI", - "MicrochipTechnology", "Ricoh Ltd.", "VLSI", "Micron Technology", -- "Hyundai Electronics", "OKI Semiconductor", "ACTEL", "Sharp", -+ "Hynix Semiconductor Inc. (former Hyundai Electronics)", "OKI Semiconductor", "ACTEL", "Sharp", - "Catalyst", "Panasonic", "IDT", "Cypress", - "DEC", "LSI Logic", "Zarlink (former Plessey)", "UTMC", - "Thinking Machine", "Thomson CSF", "Integrated CMOS (Vertex)", "Honeywell", -- "Tektronix", "Sun Microsystems", "SST", "ProMos/Mosel Vitelic", -+ "Tektronix", "Oracle Corporation (former Sun Microsystems)", "Silicon Storage Technology", "ProMos/Mosel Vitelic", - "Infineon (former Siemens)", "Macronix", "Xerox", "Plus Logic", - "SunDisk", "Elan Circuit Tech.", "European Silicon Str.", "Apple Computer", -@@ -75,5 +75,5 @@ - "Seiko Instruments", "Samsung", "I3 Design System", "Klic", - "Crosspoint Solutions", "Alliance Semiconductor", "Tandem", "Hewlett-Packard", -- "Intg. Silicon Solutions", "Brooktree", "New Media", "MHS Electronic", -+ "Integrated Silicon Solutions", "Brooktree", "New Media", "MHS Electronic", - "Performance Semi.", "Winbond Electronic", "Kawasaki Steel", "Bright Micro", - "TECMAR", "Exar", "PCMCIA", "LG Semi (former Goldstar)", -@@ -85,5 +85,5 @@ - "Aster Electronics", "Bay Networks (Synoptic)", "Zentrum or ZMD", "TRW", - "Thesys", "Solbourne Computer", "Allied-Signal", "Dialog", -- "Media Vision", "Level One Communication"], -+ "Media Vision", "Numonyx Corporation (former Level One Communication)"], - ["Cirrus Logic", "National Instruments", "ILC Data Device", "Alcatel Mietec", - "Micro Linear", "Univ. of NC", "JTAG Technologies", "BAE Systems", -@@ -120,5 +120,5 @@ - ["Camintonn Corporation", "ISOA Incorporated", "Agate Semiconductor", "ADMtek Incorporated", - "HYPERTEC", "Adhoc Technologies", "MOSAID Technologies", "Ardent Technologies", -- "Switchcore", "Cisco Systems, Inc.", "Allayer Technologies", "WorkX AG", -+ "Switchcore", "Cisco Systems, Inc.", "Allayer Technologies", "WorkX AG (Wichman)", - "Oasis Semiconductor", "Novanet Semiconductor", "E-M Solutions", "Power General", - "Advanced Hardware Arch.", "Inova Semiconductors GmbH", "Telocity", "Delkin Devices", -@@ -130,5 +130,5 @@ - "ADTEC Corporation", "Kentron Technologies", "Win Technologies", "Tachyon Semiconductor (former ASIC Designs Inc.)", - "Extreme Packet Devices", "RF Micro Devices", "Siemens AG", "Sarnoff Corporation", -- "Itautec Philco SA", "Radiata Inc.", "Benchmark Elect. (AVEX)", "Legend", -+ "Itautec SA (former Itautec Philco SA)", "Radiata Inc.", "Benchmark Elect. (AVEX)", "Legend", - "SpecTek Incorporated", "Hi/fn", "Enikia Incorporated", "SwitchOn Networks", - "AANetcom Incorporated", "Micro Memory Bank", "ESS Technology", "Virata Corporation", -@@ -172,5 +172,5 @@ - "Terawave Communications", "IceFyre Semiconductor", "Primarion", "Picochip Designs Ltd", - "Silverback Systems", "Jade Star Technologies", "Pijnenburg Securealink", -- "TakeMS International AG", "Cambridge Silicon Radio", -+ "takeMS - Ultron AG (former Memorysolution GmbH)", "Cambridge Silicon Radio", - "Swissbit", "Nazomi Communications", "eWave System", - "Rockwell Collins", "Picocel Co., Ltd.", "Alphamosaic Ltd", "Sandburst", -@@ -179,5 +179,5 @@ - "Marvell Semiconductors", "Netergy Microelectronic", "NVIDIA", "Internet Machines", - "Peak Electronics", "Litchfield Communication", "Accton Technology", "Teradiant Networks", -- "Europe Technologies", "Cortina Systems", "RAM Components", "Raqia Networks", -+ "Scaleo Chip (former Europe Technlogies)", "Cortina Systems", "RAM Components", "Raqia Networks", - "ClearSpeed", "Matsushita Battery", "Xelerated", "SimpleTech", - "Utron Technology", "Astec International", "AVM gmbH", "Redux Communications", -@@ -186,10 +186,10 @@ - "Runcom Technologies", "RedSwitch", "Dotcast", "Silicon Mountain Memory", - "Signia Technologies", "Pixim", "Galazar Networks", "White Electronic Designs", -- "Patriot Scientific", "Neoaxiom Corporation", "3Y Power Technology", "Europe Technologies", -+ "Patriot Scientific", "Neoaxiom Corporation", "3Y Power Technology", "Scaleo Chip (former Europe Technologies)", - "Potentia Power Systems", "C-guys Incorporated", "Digital Communications Technology Incorporated", "Silicon-Based Technology", - "Fulcrum Microsystems", "Positivo Informatica Ltd", "XIOtech Corporation", "PortalPlayer", -- "Zhiying Software", "Direct2Data", "Phonex Broadband", "Skyworks Solutions", -+ "Zhiying Software", "Parker Vision, Inc. (former Direct2Data)", "Phonex Broadband", "Skyworks Solutions", - "Entropic Communications", "Pacific Force Technology", "Zensys A/S", "Legend Silicon Corp.", -- "sci-worx GmbH", "SMSC (former Oasis Silicon Systems)", "Renesas Technology", "Raza Microelectronics", -+ "sci-worx GmbH", "SMSC (former Oasis Silicon Systems)", "Renesas Electronics (former Renesas Technology)", "Raza Microelectronics", - "Phyworks", "MediaTek", "Non-cents Productions", "US Modular", - "Wintegra Ltd", "Mathstar", "StarCore", "Oplus Technologies", -@@ -222,5 +222,5 @@ - "c2 Microsystems, Inc.", "Level5 Networks", "COS Memory AG", "Innovasic Semiconductor", - "02IC Co. Ltd", "Tabula, Inc.", "Crucial Technology", "Chelsio Communications", -- "Solarflare Communications", "Xambala Inc.", "EADS Astrium", "ATO Semicon Co. Ltd.", -+ "Solarflare Communications", "Xambala Inc.", "EADS Astrium", "Terra Semiconductor Inc. (former ATO Semicon Co. Ltd.)", - "Imaging Works, Inc.", "Astute Networks, Inc.", "Tzero", "Emulex", - "Power-One", "Pulse~LINK Inc.", "Hon Hai Precision Industry", "White Rock Networks Inc.", -@@ -252,5 +252,48 @@ - "InSilica", "Ember Corporation", "Avexir Technologies Corporation", "Echelon Corporation", - "Edgewater Computer Systems", "XMOS Semiconductor Ltd.", "GENUSION, Inc.", "Memory Corp NV", -- "SiliconBlue Technologies", "Rambus Inc."]); -+ "SiliconBlue Technologies", "Rambus Inc.", "Andes Technology Corporation", "Coronis Systems", -+ "Achronix Semiconductor", "Siano Mobile Silicon Ltd.", "Semtech Corporation", "Pixelworks Inc.", -+ "Gaisler Research AB", "Teranetics", "Toppan Printing Co. Ltd.", "Kingxcon", -+ "Silicon Integrated Systems", "I-O Data Device, Inc.", "NDS Americas Inc.", "Solomon Systech Limited", -+ "On Demand Microelectronics", "Amicus Wireless Inc.", "SMARDTV SNC", "Comsys Communication Ltd.", -+ "Movidia Ltd.", "Javad GNSS, Inc.", "Montage Technology Group", "Trident Microsystems", "Super Talent", -+ "Optichron, Inc.", "Future Waves UK Ltd.", "SiBEAM, Inc.", "Inicore, Inc.", "Virident Systems", -+ "M2000, Inc.", "ZeroG Wireless, Inc.", "Gingle Technology Co. Ltd.", "Space Micro Inc.", "Wilocity", -+ "Novafora, Inc.", "iKoa Corporation", "ASint Technology", "Ramtron", "Plato Networks Inc.", -+ "IPtronics AS", "Infinite-Memories", "Parade Technologies Inc.", "Dune Networks", -+ "GigaDevice Semiconductor", "Modu Ltd.", "CEITEC", "Northrop Grumman", "XRONET Corporation", -+ "Sicon Semiconductor AB", "Atla Electronics Co. Ltd.", "TOPRAM Technology", "Silego Technology Inc.", -+ "Kinglife", "Ability Industries Ltd.", "Silicon Power Computer & Communications", -+ "Augusta Technology, Inc.", "Nantronics Semiconductors", "Hilscher Gesellschaft", "Quixant Ltd.", -+ "Percello Ltd.", "NextIO Inc.", "Scanimetrics Inc.", "FS-Semi Company Ltd.", "Infinera Corporation", -+ "SandForce Inc.", "Lexar Media", "Teradyne Inc.", "Memory Exchange Corp.", "Suzhou Smartek Electronics", -+ "Avantium Corporation", "ATP Electronics Inc.", "Valens Semiconductor Ltd", "Agate Logic, Inc.", -+ "Netronome", "Zenverge, Inc.", "N-trig Ltd", "SanMax Technologies Inc.", "Contour Semiconductor Inc.", -+ "TwinMOS", "Silicon Systems, Inc.", "V-Color Technology Inc.", "Certicom Corporation", "JSC ICC Milandr", -+ "PhotoFast Global Inc.", "InnoDisk Corporation", "Muscle Power", "Energy Micro", "Innofidei", -+ "CopperGate Communications", "Holtek Semiconductor Inc.", "Myson Century, Inc.", "FIDELIX", -+ "Red Digital Cinema", "Densbits Technology", "Zempro", "MoSys", "Provigent", "Triad Semiconductor, Inc."], -+["Siklu Communication Ltd.", "A Force Manufacturing Ltd.", "Strontium", "Abilis Systems", "Siglead, Inc.", -+ "Ubicom, Inc.", "Unifosa Corporation", "Stretch, Inc.", "Lantiq Deutschland GmbH", "Visipro", -+ "EKMemory", "Microelectronics Institute ZTE", "Cognovo Ltd.", "Carry Technology Co. Ltd.", "Nokia", -+ "King Tiger Technology", "Sierra Wireless", "HT Micron", "Albatron Technology Co. Ltd.", -+ "Leica Geosystems AG", "BroadLight", "AEXEA", "ClariPhy Communications, Inc.", "Green Plug", -+ "Design Art Networks", "Mach Xtreme Technology Ltd.", "ATO Solutions Co. Ltd.", "Ramsta", -+ "Greenliant Systems, Ltd.", "Teikon", "Antec Hadron", "NavCom Technology, Inc.", -+ "Shanghai Fudan Microelectronics", "Calxeda, Inc.", "JSC EDC Electronics", "Kandit Technology Co. Ltd.", -+ "Ramos Technology", "Goldenmars Technology", "XeL Technology Inc.", "Newzone Corporation", -+ "ShenZhen MercyPower Tech", "Nanjing Yihuo Technology", "Nethra Imaging Inc.", "SiTel Semiconductor BV", -+ "SolidGear Corporation", "Topower Computer Ind Co Ltd.", "Wilocity", "Profichip GmbH", -+ "Gerad Technologies", "Ritek Corporation", "Gomos Technology Limited", "Memoright Corporation", -+ "D-Broad, Inc.", "HiSilicon Technologies", "Syndiant Inc.", "Enverv Inc.", "Cognex", -+ "Xinnova Technology Inc.", "Ultron AG", "Concord Idea Corporation", "AIM Corporation", -+ "Lifetime Memory Products", "Ramsway", "Recore Systems BV", "Haotian Jinshibo Science Tech", -+ "Being Advanced Memory", "Adesto Technologies", "Giantec Semiconductor, Inc.", "HMD Electronics AG", -+ "Gloway International (HK)", "Kingcore", "Anucell Technology Holding", -+ "Accord Software & Systems Pvt. Ltd.", "Active-Semi Inc.", "Denso Corporation", "TLSI Inc.", -+ "Shenzhen Daling Electronic Co. Ltd.", "Mustang", "Orca Systems", "Passif Semiconductor", -+ "GigaDevice Semiconductor (Beijing) Inc.", "Memphis Electronic", "Beckhoff Automation GmbH", -+ "Harmony Semiconductor Corp (former ProPlus Design Solutions)", "Air Computers SRL", "TMT Memory"] -+); - - $use_sysfs = -d '/sys/bus';