Changeset 4383

Show
Ignore:
Timestamp:
05/02/07 12:35:14 (6 years ago)
Author:
khali
Message:

Delete mkpatch and all references thereto. The kernel modules will soon
be removed from the tree so there won't be anything left to generate a
patch from.

Location:
lm-sensors/branches/lm-sensors-3.0.0
Files:
2 removed
7 modified

Legend:

Unmodified
Added
Removed

  • lm-sensors/branches/lm-sensors-3.0.0/CHANGES

    r4381 r4383  
    99  Man page sensors.conf.5: Update the chip statement section 
    1010  Program isadump: Detect when address bit 7 is a busy flag 
     11  Program mkpatch: Delete 
    1112  Program pwmconfig: Use smaller steps for low PWM values 
    1213  Program rrd: Support only hwmon class devices 

  • lm-sensors/branches/lm-sensors-3.0.0/INSTALL

    r4174 r4383  
    1919These are the installation instruction for the lm_sensors package. 
    2020 
    21 There are two ways in which you can compile and install this package. 
    22 Option 1 is much easier and is recommended. 
    23  
    24  1. Complete separate from kernel compilation 
    25     (only for 2.4 kernels 2.4.10 or later) 
    26     This will generate a set of modules which can be inserted and removed 
    27     as needed; nothing will be written into the kernel tree; 
    28  
    29  2. Patching of the kernel 
    30     (only for 2.4 kernels 2.4.13 or later) 
    31     This will patch your kernel source tree. You must recompile your kernel 
    32     to take advantage of this. But it makes it possible to compile drivers 
    33     into the kernel itself, instead of having to add them as modules. 
    34     ** AFTER YOU COMPILED AND INSTALLED YOUR KERNEL, YOU WILL STILL HAVE TO  
    35     ** COMPILE THIS PACKAGE TO GET THE USERLAND UTILITIES! 
    36     ** NOT ALL MODULES ARE PATCHED INTO THE KERNEL. SEE BELOW. 
    37  
    38  
    39  
    40 Each of these ways will be described below in detail. 
    41  
    4221NOTE: MAKE SURE YOU HAVE THE I2C-ALGO-BIT DRIVER (PART OF THE I2C PACKAGE) 
    4322      COMPILED INTO YOUR KERNEL OR AVAILABLE AS A MODULE; SOME I2C/SMBUS 
    4423      MASTER DRIVERS DEPEND ON IT! 
    4524 
    46 NOTE: IN EACH CASE, YOU WILL HAVE TO GET AND INSTALL THE I2C PACKAGE FIRST! 
    47       SET COMPILE_KERNEL TO 0 IN THE MAIN MAKEFILE FOR OPTION 2, UNLESS 
    48       YOU NEED ALPHA OR BETA DRIVERS (SEE BELOW) 
     25NOTE: YOU WILL HAVE TO GET AND INSTALL THE I2C PACKAGE FIRST! 
    4926 
    5027NOTE: PLEASE READ THE DOCUMENTATION IN THE DOC SUBDIRECTORY IF YOU GET STUCK! 
    … …  
    5936the same version number or higher as this lm_sensors package. 
    6037 
    61 All i2c components are distributed in 
    62 a separate package. There are install instructions in that package. If 
    63 you want to use compilation option 2 (patching the kernel) for lm_sensors, 
    64 you will have to use compilation option 3 (patching the kernel) for i2c 
    65 too. If you want to use compilation option 1 (compiling as modules) for 
    66 lm_sensors, you may use either compilation option 1 or 2 (compiling as 
    67 modules) or compilation option 3 (patching the kernel for i2c). See the 
    68 table below. 
    69  
    70                                           LM_SENSORS 
    71 I2C                      | option 1 (modules)      option 2 (patch kernel) 
    72 -------------------------+------------------------------------------------ 
    73 option 1 (modules)       |      YES                      NO 
    74 option 2 (modules)       |      YES                      YES 
    75 option 3 (patch kernel)  |      YES                      YES 
    76  
    77  
    78 If you use compilation option 1 (compiling as modules) for lm_sensors, you 
     38You 
    7939will have to make very sure the correct i2c header files are found. If you 
    8040get weird compilation errors, this is almost certainly going wrong. The 
    … …  
    8545how to fix this. 
    8646 
    87 NOTE: option 3 only works with 2.4 kernels 2.4.13 or later; 
    88       options 1 and 2 only work with 2.4 kernels 2.4.10 or later. 
    89  
    90  
    91 Mixing old and new, and using beta drivers (compilation option 1) 
    92 ================================================================= 
     47 
     48Mixing old and new, and using beta drivers 
     49========================================== 
    9350 
    9451It is possible that you are running a previously patched kernel, or 
    … …  
    11067be compiled as a module again.  You could do nothing with them anyway. 
    11168 
    112 Sometimes, you want to patch your kernel, but find that certain alpha 
    113 or beta drivers are not included in the patch. This is on purpose: we 
    114 do not want to polute the kernel tree with things of which we are not 
    115 confident they work. In this case, patch the kernel, compile it, and 
    116 then compile lm_sensors with COMPILE_KERNEL set to 1. 
    117  
    118  
    119 Having a proper kernel tree (compilation option 1) 
    120 ================================================== 
     69 
     70Having a proper kernel tree 
     71=========================== 
    12172 
    12273Usually, if you compile a user-space application, you can get away with 
    12374having a different version of the kernel running than the version of the 
    12475kernel header files against which you compiled it. But a perfect match 
    125 is needed for the first two compilation options above. 
     76is needed here. 
    12677 
    12778Let's say you want to use the lm_sensors modules with the kernel 2.4.32 you 
    … …  
    150101 
    151102 
    152 Separate from kernel compilation (compilation option 1) 
    153 ======================================================= 
     103Compilation 
     104=========== 
    154105 
    155106This will compile and install the complete lm_sensors package. Though  
    … …  
    177128 
    178129 
    179 Makefile configuration variables (compilation option 1) 
    180 ============================================================== 
     130Makefile configuration variables 
     131================================ 
    181132 
    182133SHELL (default: /bin/sh) 
    … …  
    188139LINUX (default: /lib/modules/$(KERNELVERSION)/build) 
    189140  The location of your kernel tree. 
    190 COMPILE_KERNEL 
    191   Determine whether you want to consider the kernel modules for compilation 
    192   at all. By default, compilation option 1 will only compile and install 
    193   those modules which are not built into the kernel. 
    194   If some modules are built into your kernel, and this package is much  
    195   newer, you may find you can not insert the newly compiled modules.  
    196   Sorry. 
    197   You may want to set this to 0 if you have just patched and compiled 
    198   your kernel using the same version of this package, and just want to 
    199   compile the user-space tools. 
    200141I2C_HEADERS (default: /usr/local/include) 
    201142  This lists where the i2c headers are found. If you used compilation 
    … …  
    246187 
    247188 
    248 Patching the kernel (compilation option 2) 
    249 ========================================== 
    250  
    251 There is a special script which should be able to generate diffs against 
    252 any 2.4 kernel (2.4.10 or later).  Please report any problems to our 
    253 mailing list.  It *is* safe to run it if your kernel already has the 
    254 lm_sensors drivers.  It will only work if you applied the i2c patches first. 
    255  
    256 ** Only a subset of the modules in lm_sensors are patched into the        ** 
    257 ** kernel by the script. See the file mkpatch/FILES to see if the         ** 
    258 ** modules you need are included. If a module you need is NOT listed      ** 
    259 ** in mkpatch/FILES, it will not be patched, and you MUST use option 1.   ** 
    260 ** If you are not sure what modules you need, run `sensors-detect' first. ** 
    261  
    262 The kernel diffs are generated by the program `mkpatch.pl' in the mkpatch 
    263 subdirectory. It needs two arguments: the first one is the root of the 
    264 lm_sensors package, the second one is the root of the kernel tree against 
    265 which the diffs will be generated. For example: 
    266   cd /tmp/lm_sensors-2.10.0 
    267   mkpatch/mkpatch.pl . /usr/src/linux > /tmp/sensors-2.10.0.patch 
    268 You can apply the diffs as usual: 
    269   cd /usr/src/linux 
    270   patch -p1 -E < /tmp/sensors-2.10.0.patch 
    271 Generation and application can easily be done in one step: 
    272   mkpatch/mkpatch.pl . /usr/src/linux | patch -p1 -E -d /usr/src/linux 
    273 The generated diffs are of course only valid for the kernel version  
    274 against which mkpatch.pl was run. 
    275  
    276 Once you have applied the patches, you can configure and compile your 
    277 kernel as usual. You will see the sensors configuration screen under the 
    278 `Character Devices' menu in menuconfig, but it will only be available 
    279 if you selected base I2C support. 
    280  
    281  
    282189Using the sensors package 
    283190========================= 

  • lm-sensors/branches/lm-sensors-3.0.0/Makefile

    r4357 r4383  
    177177ifneq ($(MAKECMDGOALS),userpackage) 
    178178ifneq ($(MAKECMDGOALS),manhtml) 
    179 SRCDIRS += mkpatch 
    180179SRCDIRS += kernel kernel/busses kernel/chips 
    181180endif 

  • lm-sensors/branches/lm-sensors-3.0.0/README.directories

    r4173 r4383  
    99* lib 
    1010  The user-space sensors support library code. 
    11 * mkpatch 
    12   A script for creating a kernel patch. 
    1311* prog 
    1412  Several supporting programs. Includes programs for detecting installed 

  • lm-sensors/branches/lm-sensors-3.0.0/doc/developers/new_drivers

    r4170 r4383  
    5959* Add the driver to the Module.mk (the makefile). 
    6060  Usually, you can just add it to KERNEL{CHIPS,DRIVERS}TARGETS in the 
    61   Module.mk file in the directory itself. Put it at the beginning, 
    62   where the comment says to put drivers NOT included in mkpatch. 
     61  Module.mk file in the directory itself. 
    6362 
    6463* Make sure it compiles cleanly. 
    … …  
    145144 
    146145--------------------------------------------------------------------- 
    147 Checklist for mkpatch support, after the driver is tested and stable: 
    148  
    149 * Add .c file to mkpatch/FILES. 
    150  
    151 * Add makefile entry in mkpatch/mkpatch.pl (2 places - old and new formats). 
    152   (don't bother with old format, obsolete) 
    153  
    154 * Add config help to mkpatch/mkpatch.pl. 
    155  
    156 * Add config entry to mkpatch/Config.in (chip drivers only) 
    157  
    158 * Add config entry in mkpatch/mkpatch.pl (bus drivers only) 
    159  
    160 * Move .o reference in kernel/[chips,busses]/Module.mk 
    161   from first to second section. 
    162  
    163  
    164 --------------------------------------------------------------------- 
    165146Checklist for _adding_ support for a chip to an _existing_ driver: 
    166147 
    … …  
    174155* Add entries for the new prefix to etc/sensors.conf.eg (chip drivers only). 
    175156 
    176 * Update config help in mkpatch/mkpatch.pl. 
    177  
    178 * Update config entry in mkpatch/Config.in (chip drivers only) 
    179  
    180 * Update config entry in mkpatch/mkpatch.pl (bus drivers only) 
    181  
    182157* Update doc/[chips,busses]/xxx file 
    183158 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/busses/Module.mk

    r2971 r4383  
    2424# Regrettably, even 'simply expanded variables' will not put their currently 
    2525# defined value verbatim into the command-list of rules... 
    26 # These targets are NOT included in 'mkpatch' ... 
    2726KERNELBUSSESTARGETS := 
    2827ifeq ($(shell if grep -q '^CONFIG_IPMI_HANDLER=' $(LINUX)/.config; then echo 1; fi),1) 
    … …  
    3231endif 
    3332 
    34 # These targets ARE included in 'mkpatch' ... 
    3533ifneq ($(shell if grep -q '^CONFIG_I2C_ALI1535=y' $(LINUX)/.config; then echo 1; fi),1) 
    3634KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ali1535.o 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/Module.mk

    r4070 r4383  
    2525# defined value verbatim into the command-list of rules... 
    2626 
    27 # These targets are NOT included in 'mkpatch' 
    2827KERNELCHIPSTARGETS := 
    2928ifeq ($(shell if grep -q '^CONFIG_IPMI_HANDLER=' $(LINUX)/.config; then echo 1; fi),1) 
    … …  
    3837 
    3938 
    40 # These targets ARE included in 'mkpatch' 
    4139ifneq ($(shell if grep -q '^CONFIG_SENSORS_ADM1021=y' $(LINUX)/.config; then echo 1; fi),1) 
    4240KERNELCHIPSTARGETS += $(MODULE_DIR)/adm1021.o