From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Authentication-Warning: pc213.sam-solutions.net: ed set sender to ed@altlinux.ru using -f X-Comment-To: Sergey Vlasov To: ALT Linux kernel packages development Subject: Re: [d-kernel] Re: lm_sensors In-Reply-To: <20030723160409.5395753e.vsu@altlinux.ru> (Sergey Vlasov's message of "Wed, 23 Jul 2003 16:04:09 +0400") References: <20030721160226.GA24482@basalt.office.altlinux.org> <20030722175101.452b07b1.vsu@altlinux.ru> <20030722194808.2386fc6a.vsu@altlinux.ru> <20030722211043.1cb99189.vsu@altlinux.ru> <20030723160409.5395753e.vsu@altlinux.ru> From: ed@altlinux.ru (Ed V. Bartosh) Organization: ALT Linux Date: Wed, 23 Jul 2003 15:35:55 +0400 Message-ID: User-Agent: Gnus/5.1002 (Gnus v5.10.2) XEmacs/21.4 (Portable Code, linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: devel-kernel@altlinux.ru X-Mailman-Version: 2.1.2 Precedence: list Reply-To: ALT Linux kernel packages development List-Id: ALT Linux kernel packages development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jul 2003 12:37:04 -0000 Archived-At: List-Archive: List-Post: --=-=-= Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 8bit >>>>> "SV" == Sergey Vlasov writes: >> SV> kernel-feat-i2c-2.8.0-alt1.src.rpm >> А как ты смотришь на то, чтобы перенести возню с kernel-sources >> на этап приложения патча ? А здесь просто положить сорцы куда >> надо. А то как-то тяжеловесно выглядит вся эта распаковка. SV> Так было раньше. В принципе можно и вернуть, тогда к тому SV> скрипту apply, который там был, ещё надо будет добавить SV> возможность наложения патчей. Ну и ладно. Зато кернеловые сорцы не нужно будет распаковывать каждый раз. Впрочем смотри сам. SV> Недостаток такой схемы, как я уже писал, в том, что при этом SV> ранее наложенные на i2c патчи молча откатываются без сообщения SV> об этом. Т.е. нужно следить за порядком - patch по этому поводу SV> ничего не скажет. Только теперь kernel-feat-i2c не может быть SV> первым - он должен идти после kernel-feat-bttv, либо надо SV> править сам bttv (причём разработчики i2c не предусмотрели SV> какого-либо #define с версией, пригодного для проверки - есть SV> только строка; видимо, придётся цепляться к какому-то SV> идентификатору, появившемуся в это время в linux/i2c-ids.h). Нужна некая схема зависимостей на патчи, чтобы в неправильном порядке нельзя было приложить, а еще лучше чтобы они прикладывались автоматом при надобности. И было бы неплохо встроить это дело в apply_patches. Я тут перенес в спек kernel-source-lm_sensors, спек и патчи приаттачиваю, глянь, плз. Кроме того с i2c проблемы - конфликтует с kernel-headers по поводу /usr/include/linux/{i2c-dev.h,sensors.h}. Я их пока убрал из спека, но в kernel-headers-..., собранном уже с новым feat-i2c эти файлы почему-то другого размера, что есть странно и неправильно, нужно разбираться. -- Best regards, Ed V. Bartosh --=-=-= Content-Type: application/octet-stream Content-Disposition: attachment; filename=lm_sensors Content-Transfer-Encoding: base64 IyAtKi0gcnBtLXNwZWMgLSotCiMgJElkOiBsbV9zZW5zb3JzLHYgMS43IDIwMDMvMDcvMjMg MTE6NDI6NDkgZWQgRXhwICQKIwoKTmFtZTogbG1fc2Vuc29ycwpWZXJzaW9uOiAyLjguMApS ZWxlYXNlOiBhbHQyCgpTdW1tYXJ5OiBIYXJkd2FyZSBIZWFsdGggTW9uaXRvcmluZyBUb29s cwpTdW1tYXJ5KHJ1X1JVLktPSTgtUik6IPXUyczJ1Nkgz9TTzMXWydfBzsnRINLBws/U2SDP ws/S1cTP18HOydEKTGljZW5zZTogR1BMCkdyb3VwOiBTeXN0ZW0vS2VybmVsIGFuZCBoYXJk d2FyZQpVcmw6IGh0dHA6Ly93d3cubG0tc2Vuc29ycy5udS8KClNvdXJjZTogZnRwOi8vZnRw Lm5ldHJvZWRnZS5jb20vcHViLyVuYW1lLyVuYW1lLSV2ZXJzaW9uLnRhci5iejIKUGF0Y2gw OiAlbmFtZS0yLjYuNS1hbHQtdXJsdmlldy5wYXRjaApQYXRjaDE6ICVuYW1lLSV2ZXJzaW9u LW1ha2VmaWxlLWZpeGVzLnBhdGNoClBhdGNoMjogJW5hbWUtJXZlcnNpb24tbWFrZWZpbGUt Z3JlcC1maXhlcy5wYXRjaAoKUmVxdWlyZXM6IGxpYnNlbnNvcnMgPSAldmVyc2lvbi0lcmVs ZWFzZSwga2VybmVsID49IDIuMi4xNi1pcGwxbWRrCgojQnVpbGRQcmVSZXE6IGtlcm5lbC1o ZWFkZXJzID49IDIuMi4xOC1pcGwxbWRrCgojIEF1dG9tYXRpY2FsbHkgYWRkZWQgYnkgYnVp bGRyZXEgb24gU2F0IEp1bCAxOSAyMDAzCkJ1aWxkUmVxdWlyZXM6IGZsZXgKCiVwYWNrYWdl IGdyYXBoClN1bW1hcnk6IEhhcmR3YXJlIEhlYWx0aCBNb25pdG9yaW5nIFRvb2xzIC0gZ3Jh cGggYWRkb24KR3JvdXA6IFN5c3RlbS9LZXJuZWwgYW5kIGhhcmR3YXJlClJlcXVpcmVzOiAl bmFtZSA9ICV2ZXJzaW9uLSVyZWxlYXNlCgolcGFja2FnZSAtbiBsaWJzZW5zb3JzClN1bW1h cnk6IFNoYXJlZCBsaWJyYXJ5IGZvciBoYXJkd2FyZSBoZWFsdGggbW9uaXRvcmluZyB0b29s cwpHcm91cDogU3lzdGVtL0xpYnJhcmllcwoKJXBhY2thZ2UgLW4gbGlic2Vuc29ycy1kZXZl bApTdW1tYXJ5OiBEZXZlbG9wbWVudCBlbnZpcm9ubWVudCBmb3IgaGFyZHdhcmUgaGVhbHRo IG1vbml0b3JpbmcgdG9vbHMKR3JvdXA6IERldmVsb3BtZW50L0MKUmVxdWlyZXM6IGxpYnNl bnNvcnMgPSAldmVyc2lvbi0lcmVsZWFzZQpQcm92aWRlczogJW5hbWUtZGV2ZWwgPSAldmVy c2lvbgpPYnNvbGV0ZXM6ICVuYW1lLWRldmVsCgolcGFja2FnZSAtbiBsaWJzZW5zb3JzLWRl dmVsLXN0YXRpYwpTdW1tYXJ5OiBTdGF0aWMgbGlicmFyeSBmb3IgZGV2ZWxvcGluZyBoYXJk d2FyZSBoZWFsdGggbW9uaXRvcmluZyB0b29scwpHcm91cDogRGV2ZWxvcG1lbnQvQwpSZXF1 aXJlczogbGlic2Vuc29ycy1kZXZlbCA9ICV2ZXJzaW9uLSVyZWxlYXNlCgolcGFja2FnZSAt biBrZXJuZWwtc291cmNlLSVuYW1lClN1bW1hcnk6IExpbnV4ICVuYW1lIG1vZHVsZScgc291 cmNlcwpHcm91cDogRGV2ZWxvcG1lbnQvS2VybmVsCgolZGVzY3JpcHRpb24KVGhpcyBwYWNr YWdlIGNvbnRhaW5zIGEgY29sbGVjdGlvbiBvZiB1c2VyIHNwYWNlIHRvb2xzIGZvciBnZW5l cmFsIFNNQnVzCmFjY2VzcyBhbmQgaGFyZHdhcmUgbW9uaXRvcmluZy4gU01CdXMsIGFsc28g a25vd24gYXMgU3lzdGVtIE1hbmFnZW1lbnQgQnVzLAppcyBhIHByb3RvY29sIGZvciBjb21t dW5pY2F0aW5nIHRocm91Z2ggYSBJMkMgKCdJIHNxdWFyZWQgQycpIGJ1cy4gTWFueSBtb2Rl cm4KbWFpbmJvYXJkcyBoYXZlIGEgU3lzdGVtIE1hbmFnZW1lbnQgQnVzLiBUaGVyZSBhcmUg YSBsb3Qgb2YgZGV2aWNlcyB3aGljaCBjYW4KYmUgY29ubmVjdGVkIHRvIGEgU01CdXM7IHRo ZSBtb3N0IG5vdGFibGUgYXJlIG1vZGVybiBtZW1vcnkgY2hpcHMgd2l0aCBFRVBST00KbWVt b3JpZXMgYW5kIGNoaXBzIGZvciBoYXJkd2FyZSBtb25pdG9yaW5nLgoKTW9zdCBtb2Rlcm4g bWFpbmJvYXJkcyBpbmNvcnBvcmF0ZSBzb21lIGZvcm0gb2YgaGFyZHdhcmUgbW9uaXRvcmlu ZyBjaGlwcy4KVGhlc2UgY2hpcHMgcmVhZCB0aGluZ3MgbGlrZSBjaGlwIHRlbXBlcmF0dXJl cywgZmFuIHJvdGF0aW9uIHNwZWVkcyBhbmQKdm9sdGFnZSBsZXZlbHMuIFRoZXJlIGFyZSBx dWl0ZSBhIGZldyBkaWZmZXJlbnQgY2hpcHMgd2hpY2ggY2FuIGJlIHVzZWQKYnkgbWFpbmJv YXJkIGJ1aWxkZXJzIGZvciBhcHByb3hpbWF0ZWx5IHRoZSBzYW1lIHJlc3VsdHMuCgolZGVz Y3JpcHRpb24gZ3JhcGgKVGhpcyBwYWNrYWdlIGFkZHMgYSBncmFwaGljcyBkcmF3IHRlbXBl cmF0dXJlIHBsdWdpbi4KCklmIHlvdSB3YW50IHRvIGluc3RhbGwgdGhpcyBwYWNrYWdlIHlv dSdsbCBhbHNvIG5lZWQgSW1hZ2VNYWdpY2sKYW5kIGdudXBsb3QgdG9vbHMuCgolZGVzY3Jp cHRpb24gLW4gbGlic2Vuc29ycwpUaGlzIHBhY2thZ2UgY29udGFpbnMgc2hhcmVkIGxpYnJh cnkgcmVxdWlyZWQgZm9yIHVzZXIgc3BhY2UgYXBwbGljYXRpb25zCmZvciBnZW5lcmFsIFNN QnVzIGFjY2VzcyBhbmQgaGFyZHdhcmUgbW9uaXRvcmluZy4gU01CdXMsIGFsc28ga25vd24g YXMKU3lzdGVtIE1hbmFnZW1lbnQgQnVzLCBpcyBhIHByb3RvY29sIGZvciBjb21tdW5pY2F0 aW5nIHRocm91Z2ggYSBJMkMKKCdJIHNxdWFyZWQgQycpIGJ1cy4gTWFueSBtb2Rlcm4gbWFp bmJvYXJkcyBoYXZlIGEgU3lzdGVtIE1hbmFnZW1lbnQgQnVzLgpUaGVyZSBhcmUgYSBsb3Qg b2YgZGV2aWNlcyB3aGljaCBjYW4gYmUgY29ubmVjdGVkIHRvIGEgU01CdXM7IHRoZSBtb3N0 Cm5vdGFibGUgYXJlIG1vZGVybiBtZW1vcnkgY2hpcHMgd2l0aCBFRVBST00gbWVtb3JpZXMg YW5kIGNoaXBzIGZvciBoYXJkd2FyZQptb25pdG9yaW5nLgoKJWRlc2NyaXB0aW9uIC1uIGxp YnNlbnNvcnMtZGV2ZWwKVGhpcyBwYWNrYWdlIGNvbnRhaW5zIGVudmlyb25tZW50IGZvciBk ZXZlbG9wbWVudCBvZiB1c2VyIHNwYWNlIGFwcGxpY2F0aW9ucwpmb3IgZ2VuZXJhbCBTTUJ1 cyBhY2Nlc3MgYW5kIGhhcmR3YXJlIG1vbml0b3JpbmcuIFNNQnVzLCBhbHNvIGtub3duIGFz ClN5c3RlbSBNYW5hZ2VtZW50IEJ1cywgaXMgYSBwcm90b2NvbCBmb3IgY29tbXVuaWNhdGlu ZyB0aHJvdWdoIGEgSTJDCignSSBzcXVhcmVkIEMnKSBidXMuIE1hbnkgbW9kZXJuIG1haW5i b2FyZHMgaGF2ZSBhIFN5c3RlbSBNYW5hZ2VtZW50IEJ1cy4KVGhlcmUgYXJlIGEgbG90IG9m IGRldmljZXMgd2hpY2ggY2FuIGJlIGNvbm5lY3RlZCB0byBhIFNNQnVzOyB0aGUgbW9zdApu b3RhYmxlIGFyZSBtb2Rlcm4gbWVtb3J5IGNoaXBzIHdpdGggRUVQUk9NIG1lbW9yaWVzIGFu ZCBjaGlwcyBmb3IgaGFyZHdhcmUKbW9uaXRvcmluZy4KCiVkZXNjcmlwdGlvbiAtbiBsaWJz ZW5zb3JzLWRldmVsLXN0YXRpYwpUaGlzIHBhY2thZ2UgY29udGFpbnMgc3RhdGljIGxpYnJh cnkgZm9yIGRldmVsb3BtZW50IG9mIHN0YXRpY2FsbHkgbGlua2VkCnVzZXIgc3BhY2UgYXBw bGljYXRpb25zIGZvciBnZW5lcmFsIFNNQnVzIGFjY2VzcyBhbmQgaGFyZHdhcmUgbW9uaXRv cmluZy4KCiVkZXNjcmlwdGlvbiAtbiBrZXJuZWwtc291cmNlLSVuYW1lClRoaXMgcGFja2Fn ZSBjb250YWlucyAlbmFtZSBzb3VyY2VzIGZvciBMaW51eCBrZXJuZWwgbW9kdWxlCgolcHJl cAolc2V0dXAgLXEKJXBhdGNoMCAtcDEKJXBhdGNoMSAtcDEKJXBhdGNoMiAtcDEKCmZpbmQg LXR5cGUgZiAtbmFtZSBNb2R1bGUubWtcKiAtcHJpbnQwIHwKCXhhcmdzIC1yMCAlX19ncmVw IC1abCAnXCQoSU5TVEFMTCkuKiAtby4qIC1nJyB8Cgl4YXJncyAtcjAgJV9fc3Vic3QgJ3N8 XChcJChJTlNUQUxMKS4qXCkgLW8gKltBLVphLXokKCl7fV0qIC1nICpbQS1aYS16JCgpe31d KnxcMXxnJwoKJV9fY3AgLVIgIC4vIC4uL2tlcm5lbC1zb3VyY2UtJW5hbWUtJXZlcnNpb24K CmVjaG8gJyMgS2VybmVsIHBhcnRzIGRpc2FibGVkJyA+a2VybmVsL01vZHVsZS5tawplY2hv ICcjIEtlcm5lbCBwYXJ0cyBkaXNhYmxlZCcgPmtlcm5lbC9idXNzZXMvTW9kdWxlLm1rCmVj aG8gJ0tFUk5FTENISVBTRElSID0ga2VybmVsL2NoaXBzJyA+a2VybmVsL2NoaXBzL01vZHVs ZS5tawoKJWJ1aWxkCm1ha2UgdXNlciBcCglMSU5VWD0vdmFyL2VtcHR5IFwKCUkyQ19IRUFE RVJTPS92YXIvZW1wdHkgXAoJQ0ZMQUdTPSIkUlBNX09QVF9GTEFHUyIgXAoJUFJFRklYPSVw cmVmaXggXAoJRVRDRElSPSVfc3lzY29uZmRpcgoKJWluc3RhbGwKJV9fbWtkaXJfcCAkUlBN X0JVSUxEX1JPT1QlX2RhdGFkaXIvJW5hbWUKJV9fbWtkaXJfcCAlYnVpbGRyb290JV91c3Jz cmMva2VybmVsL3NvdXJjZXMvCiVfX21rZGlyX3AgJWJ1aWxkcm9vdCVfZGVmYXVsdGRvY2Rp ci9rZXJuZWwtZG9jLSVtb2R1bGVfbmFtZS0ldmVyc2lvbgoKJW1ha2VfaW5zdGFsbCB1c2Vy X2luc3RhbGwgXAoJTElOVVg9L3Zhci9lbXB0eSBcCglJMkNfSEVBREVSUz0vdmFyL2VtcHR5 IFwKCURFU1RESVI9JFJQTV9CVUlMRF9ST09UIFwKCVBSRUZJWD0lcHJlZml4IFwKCUVUQ0RJ Uj0lX3N5c2NvbmZkaXIgXAoJTUFORElSPSVfbWFuZGlyCgpmb3IgZiBpbiBgZmluZCBwcm9n IC10eXBlIGZgOyBkbwoJaWYgZmlsZSAiJGYiIHwlX19ncmVwIC1GcSAnIGV4ZWN1dGFibGUn OyB0aGVuCgkJaWYgWyAhIC1mICIkUlBNX0JVSUxEX1JPT1QlX2JpbmRpci8ke2YjIyovfSIg LWEgISAtZiAiJFJQTV9CVUlMRF9ST09UJV9zYmluZGlyLyR7ZiMjKi99IiBdOyB0aGVuCgkJ CSVfX2luc3RhbGwgLXAgLW03NTUgIiRmIiAkUlBNX0JVSUxEX1JPT1QlX2RhdGFkaXIvJW5h bWUKCQlmaQoJZmkKZG9uZQoKJV9fY2htb2QgNzU1ICRSUE1fQlVJTERfUk9PVCVfbGliZGly Lyouc28uKgoKIyBGaW5kIGZpbGVzIGZvciBtYWluIHBhY2thZ2UKZmluZCAkUlBNX0JVSUxE X1JPT1QlX2RhdGFkaXIvJW5hbWUgLXR5cGUgZiAtcHJpbnQgfAoJJV9fZ3JlcCAtRnYgdGVs bGVyc3RhdHMuc2ggfAoJJV9fc2VkIC1lICJzQCRSUE1fQlVJTERfUk9PVEBAIiA+JW5hbWUu bGlzdAoKIyBNYWtlIGtlcm5lbC1zb3VyY2UgdGFyYmFsbApjZCAuLgolX190YXIgLWMga2Vy bmVsLXNvdXJjZS0lbmFtZS0ldmVyc2lvbiB8IGJ6aXAyIC1jID4gXAoJJWJ1aWxkcm9vdCVf dXNyc3JjL2tlcm5lbC9zb3VyY2VzL2tlcm5lbC1zb3VyY2UtJW5hbWUtJXZlcnNpb24udGFy LmJ6MgoKJXBvc3QgLW4gbGlic2Vuc29ycyAtcCAlcG9zdF9sZGNvbmZpZwolcG9zdHVuIC1u IGxpYnNlbnNvcnMgLXAgJXBvc3R1bl9sZGNvbmZpZwoKJWZpbGVzIC1mICVuYW1lLmxpc3QK JWNvbmZpZyhub3JlcGxhY2UpICVfc3lzY29uZmRpci9zZW5zb3JzLmNvbmYKJV9iaW5kaXIv KgolX3NiaW5kaXIvKgolZGlyICVfZGF0YWRpci8lbmFtZQolX21hbmRpci9tYW5bMTVdLyoK JWRvYyBCQUNLR1JPVU5EIEJVR1MgQ0hBTkdFUyBDT05UUklCVVRPUlMgSU5TVEFMTCBSRUFE TUUqIFRPRE8gZG9jLyogZXRjL3NlbnNvcnMuY29uZi5lZwoKJWZpbGVzIGdyYXBoCiVkaXIg JV9kYXRhZGlyLyVuYW1lCiVfZGF0YWRpci8lbmFtZS90ZWxsZXJzdGF0cy5zaAoKJWZpbGVz IC1uIGxpYnNlbnNvcnMKJV9saWJkaXIvKi5zby4qCgolZmlsZXMgLW4gbGlic2Vuc29ycy1k ZXZlbAolX2xpYmRpci8qLnNvCiVfaW5jbHVkZWRpci9zZW5zb3JzLyoKJV9tYW4zZGlyLyoK CiVmaWxlcyAtbiBsaWJzZW5zb3JzLWRldmVsLXN0YXRpYwolX2xpYmRpci8qLmEKCiVmaWxl cyAtbiBrZXJuZWwtc291cmNlLSVuYW1lCiV7X3VzcnNyY30va2VybmVsL3NvdXJjZXMva2Vy bmVsLXNvdXJjZS0lbmFtZS0ldmVyc2lvbi50YXIuYnoyCgolY2hhbmdlbG9nCiogV2VkIEp1 bCAyMyAyMDAzIEVkIFYuIEJhcnRvc2ggPGVkQHNhbS1zb2x1dGlvbnMubmV0PiAyLjguMC1h bHQyCi0ga2VybmVsLXNvdXJjZS1sbV9zZW5zb3JzIHBhY2thZ2UgYWRkZWQKCiogVHVlIEp1 bCAyMiAyMDAzIFNlcmdleSBWbGFzb3YgPHZzdUBhbHRsaW51eC5ydT4gMi44LjAtYWx0MQot IDIuOC4wCgoqIE1vbiBOb3YgMTEgMjAwMiBEbWl0cnkgVi4gTGV2aW4gPGxkdkBhbHRsaW51 eC5vcmc+IDIuNi41LWFsdDIKLSBGaXhlZCB1cmwgaGFuZGxlciBwYXRjaC4KLSBVcGRhdGVk IGRlcGVuZGVuY2llcy4KLSBVc2Ugc3Vic3QgaW5zdGVhZCBvZiBwZXJsIGZvciBidWlsZC4K CiogTW9uIE5vdiAxMSAyMDAyIFJpZGVyIDxyaWRlckBhbHRsaW51eC5ydT4gMi42LjUtYWx0 MQotIDIuNi41CgoqIFRodSBNYXkgMjMgMjAwMiBEbWl0cnkgVi4gTGV2aW4gPGxkdkBhbHRs aW51eC5vcmc+IDIuNi4zLWFsdDEKLSAyLjYuMwoKKiBNb24gTm92IDI2IDIwMDEgRG1pdHJ5 IFYuIExldmluIDxsZHZAYWx0LWxpbnV4Lm9yZz4gMi42LjItYWx0MQotIDIuNi4yCgoqIFRo dSBTZXAgMDYgMjAwMSBEbWl0cnkgVi4gTGV2aW4gPGxkdkBhbHRsaW51eC5ydT4gMi42LjEt YWx0MQotIDIuNi4xCi0gTW92ZWQgc3RhdGljIGxpYnJhcnkgdG8gZGV2ZWwtc3RhdGljIHN1 YnBhY2thZ2UuCgoqIFRodSBBdWcgMTYgMjAwMSBEbWl0cnkgVi4gTGV2aW4gPGxkdkBhbHRs aW51eC5ydT4gMi42LjAtYWx0MgotIE1vdmVkIHRlbGxlcnN0YXRzLnNoIHNjcmlwdCB0byBn cmFwaCBzdWJwYWNrYWdlICh0b28gbWFueSByZXF1aXJlcykuCgoqIFdlZCBBdWcgMTUgMjAw MSBEbWl0cnkgVi4gTGV2aW4gPGxkdkBhbHRsaW51eC5ydT4gMi42LjAtYWx0MQotIDIuNi4w Ci0gQnVpbGQgd2l0aCBrZXJuZWwgaGVhZGVycyAoaW5zdGVhZCBvZiBzb3VyY2VzKS4KCiog TW9uIEZlYiAxMiAyMDAxIERtaXRyeSBWLiBMZXZpbiA8bGR2QGZhbmRyYS5vcmc+IDIuNS41 LWlwbDJtZGsKLSBGaXhlZCBpbmNvcnJlY3QgYXV0b3JlcXVpcmVzLgoKKiBUdWUgSmFuIDIz IDIwMDEgRG1pdHJ5IFYuIExldmluIDxsZHZAZmFuZHJhLm9yZz4gMi41LjUtaXBsMW1kawot IDIuNS41Ci0gTGliaWZpY2F0aW9uLgoKKiBGcmkgTm92IDI0IDIwMDAgRG1pdHJ5IFYuIExl dmluIDxsZHZAZmFuZHJhLm9yZz4gMi41LjQtaXBsMW1kawotIDIuNS40Ci0gRkhTaWZpY2F0 aW9uLgoKKiBXZWQgSnVsIDEyIDIwMDAgRG1pdHJ5IFYuIExldmluIDxsZHZAZmFuZHJhLm9y Zz4gMi41LjItaXBsMW1kawotIDIuNS4yCgoqIFdlZCBNYXkgMzEgMjAwMCBEbWl0cnkgVi4g TGV2aW4gPGxkdkBmYW5kcmEub3JnPgotIFJFIGFkYXB0aW9ucy4KCiogRnJpIE1heSAxNiAy MDAwIERtaXRyeSBWLiBMZXZpbiA8bGR2QGZhbmRyYS5vcmc+Ci0gMi41LjAKCiogU3VuIEph biAzMCAyMDAwIERtaXRyeSBWLiBMZXZpbiA8bGR2QGZhbmRyYS5vcmc+Ci0gMi40LjUKCiog V2VkIE5vdiAxNyAxOTk5IERtaXRyeSBWLiBMZXZpbiA8bGR2QGZhbmRyYS5vcmc+Ci0gMi40 LjMKCiogV2VkIE9jdCAwNiAxOTk5IERtaXRyeSBWLiBMZXZpbiA8bGR2QGZhbmRyYS5vcmc+ Ci0gRmFuZHJhIGFkYXB0aW9ucy4KCiogRnJpIFNlcCAwMyAxOTk5IEdpdXNlcHBlIEdoaWLy IDxnaGlib0BsaW51eC1tYW5kcmFrZS5jb20+Ci0gY29tcGlsZWQgZm9yIGtlcm5lbCAyLjIu MTEyCi0gYWRkZWQgc2NyaXB0cyBpbiAlcHJlZml4L2xpYi9sbV9zZW5zb3JzCi0gYWRkZWQg bWFuIHBhZ2UKLSBtYW5kcmFrZSBhZGFwdGlvbnMKCiogU3VuIE1heSAgMiAxOTk5ICBJYW4g TWFjZG9uYWxkIDxpYW5tYWNkQHhzNGFsbC5ubD4KLSBjb21waWxlZCBmb3Iga2VybmVsIDIu Mi43CgoqIFN1biBBcHIgMjUgMTk5OSAgSWFuIE1hY2RvbmFsZCA8aWFubWFjZEB4czRhbGwu bmw+Ci0gY29tcGlsZWQgZm9yIGtlcm5lbCAyLjIuNgotIGh5cGhlbiBjaGFuZ2VkIHRvIHVu ZGVyc2NvcmUgaW4gdmVyc2lvbiBudW1iZXIgdG8gc2F0aXNmeSBSUE0gMy4wCgoqIE1vbiBB cHIgIDUgMTk5OSAgSWFuIE1hY2RvbmFsZCA8aWFubWFjZEB4czRhbGwubmw+Ci0gY29tcGls ZWQgZm9yIGtlcm5lbCAyLjIuNQoKKiBXZWQgTWFyIDI0IDE5OTkgIElhbiBNYWNkb25hbGQg PGlhbm1hY2RAeHM0YWxsLm5sPgotIGNvbXBpbGVkIGZvciBrZXJuZWwgMi4yLjQKCiogVHVl IE1hciAgOCAxOTk5ICBJYW4gTWFjZG9uYWxkIDxpYW5tYWNkQHhzNGFsbC5ubD4KLSBjb21w aWxlZCBmb3Iga2VybmVsIDIuMi4zCgoqIEZyaSBGZWIgMjYgMTk5OSAgSWFuIE1hY2RvbmFs ZCA8aWFubWFjZEB4czRhbGwubmw+Ci0gdXBkYXRlZCB0byBsbV9zZW5zb3JzIDIuMi4yIGFu ZCBjb21waWxlZCBmb3Iga2VybmVsIDIuMi4yCi0gYWRkZWQgL2V0Yy9zZW5zb3JzLmNvbmYK LSBhZGRlZCAlcG9zdCBhbmQgJXBvc3R1biBzY3JpcHRzCg== --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=lm_sensors-2.8.0-makefile-fixes.patch --- lm_sensors-2.8.0/prog/hotplug/Makefile.makefile-fixes 2001-03-24 21:35:13 +0300 +++ lm_sensors-2.8.0/prog/hotplug/Makefile 2003-04-01 17:49:09 +0400 @@ -18,7 +18,7 @@ $(CC) $(CFLAGS) -c $< -o $@ install: all - install -o root -g root -m 644 $(OBJS) /lib/modules/$(VER)/kernel/drivers/i2c/busses + install -m 644 $(OBJS) /lib/modules/$(VER)/kernel/drivers/i2c/busses clean: rm -f $(OBJS) --- lm_sensors-2.8.0/prog/rrd/Makefile.makefile-fixes 2002-01-05 18:39:17 +0300 +++ lm_sensors-2.8.0/prog/rrd/Makefile 2003-04-01 17:48:46 +0400 @@ -41,10 +41,10 @@ install -d -o $(USER) -m 777 $(APACHDIR)/pix install: all $(RRDB) $(SENSDIR) $(CRONTAB) $(APACHDIR)/pix - install -o root -g root -m 755 sens_update_rrd $(BINPATH) - install -o root -g root -m 755 sens_week.cgi $(APACHDIR) - install -o root -g root -m 755 sens_day.cgi $(APACHDIR) - install -o root -g root -m 755 summ_week.cgi $(APACHDIR) + install -m 755 sens_update_rrd $(BINPATH) + install -m 755 sens_week.cgi $(APACHDIR) + install -m 755 sens_day.cgi $(APACHDIR) + install -m 755 summ_week.cgi $(APACHDIR) # grep sens_update_rrd $(CRONTAB) > /dev/null 2>&1 || echo '*/5 * * * * /usr/local/bin/sens_update_rrd' $(RRDB) $(SENSDEV) >> $(CRONTAB) @echo @echo Note!!! You must manually install the following line in the crontab for user $(USER): --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=lm_sensors-2.8.0-makefile-grep-fixes.patch --- kernel-source-sensors-2.8.0/Makefile~ 2002-12-04 18:44:32 +0300 +++ kernel-source-sensors-2.8.0/Makefile 2003-06-25 13:56:29 +0400 @@ -54,8 +54,7 @@ # Uncomment the third line on SMP systems if the magic invocation fails. It # is a bit complicated because SMP configuration changed around kernel 2.1.130 -SMP := $(shell if grep -q '^SMP[[:space:]]*=' $(LINUX)/Makefile || \ - grep -q '^[[:space:]]*\#define[[:space:]]*CONFIG_SMP[[:space:]]*1' $(LINUX_HEADERS)/linux/autoconf.h ; \ +SMP := $(shell if grep -q '^[[:space:]]*\#define[[:space:]]*CONFIG_SMP[[:space:]]*1' $(LINUX_HEADERS)/linux/autoconf.h ; \ then echo 1; else echo 0; fi) #SMP := 0 #SMP := 1 --- kernel-source-sensors-2.8.0/kernel/busses/Module.mk.orig 2003-06-25 14:05:06 +0400 +++ kernel-source-sensors-2.8.0/kernel/busses/Module.mk 2003-06-25 14:23:33 +0400 @@ -26,68 +26,68 @@ # These targets are NOT included in 'mkpatch' ... KERNELBUSSESTARGETS := KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-nforce2.o -ifeq ($(shell if grep -q '^CONFIG_IPMI_HANDLER=' $(LINUX)/.config; then echo 1; fi),1) +ifeq ($(shell if grep -q '^\#define.*CONFIG_IPMI_HANDLER.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ipmb.o KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ipmi.o endif # These targets ARE included in 'mkpatch' ... -ifneq ($(shell if grep -q '^CONFIG_I2C_ALI1535=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_ALI1535.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ali1535.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_ALI15X3=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_ALI15X3.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-ali15x3.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_AMD756=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_AMD756.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-amd756.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_AMD8111=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_AMD8111.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-amd8111.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_HYDRA=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_HYDRA.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-hydra.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_I801=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_I801.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-i801.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_I810=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_I810.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-i810.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_ISA=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_ISA.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-isa.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_SIS5595=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_SIS5595.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis5595.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_SIS630=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_SIS630.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis630.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_SIS645=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_SIS645.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-sis645.o endif # don't compile dmi_scan unless x86 because it needs isa access -ifneq ($(shell if grep -q '^CONFIG_I2C_PIIX4=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_PIIX4.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-piix4.o -ifeq ($(shell if grep -q '^CONFIG_X86=y' $(LINUX)/.config; then echo 1; fi),1) +ifeq ($(shell if grep -q '^\#define.*CONFIG_X86.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/dmi_scan.o endif endif -ifneq ($(shell if grep -q '^CONFIG_I2C_SAVAGE4=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_SAVAGE4.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-savage4.o endif # don't compile unless alpha because of kernel include-file dependencies ifeq ($(MACHINE),alpha) -ifneq ($(shell if grep -q '^CONFIG_I2C_TSUNAMI=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_TSUNAMI.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-tsunami.o endif endif -ifneq ($(shell if grep -q '^CONFIG_I2C_VIA=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_VIA.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-via.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_VIAPRO=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_VIAPRO.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-viapro.o endif -ifneq ($(shell if grep -q '^CONFIG_I2C_VOODOO3=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_I2C_VOODOO3.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-voodoo3.o endif --- kernel-source-sensors-2.8.0/kernel/chips/Module.mk.orig 2003-06-25 14:12:25 +0400 +++ kernel-source-sensors-2.8.0/kernel/chips/Module.mk 2003-06-25 14:12:37 +0400 @@ -25,7 +25,7 @@ # defined value verbatim into the command-list of rules... # These targets are NOT included in 'mkpatch' ... KERNELCHIPSTARGETS := -ifeq ($(shell if grep -q '^CONFIG_IPMI_HANDLER=' $(LINUX)/.config; then echo 1; fi),1) +ifeq ($(shell if grep -q '^\#define.*CONFIG_IPMI_HANDLER.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/bmcsensors.o endif KERNELCHIPSTARGETS += $(MODULE_DIR)/ds1307.o @@ -38,100 +38,100 @@ # These targets ARE included in 'mkpatch', except for LTC1710, which we # leave here because it used to be in 'mkpatch' ... -ifneq ($(shell if grep -q '^CONFIG_SENSORS_ADM1021=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_ADM1021.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/adm1021.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_ADM1024=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_ADM1024.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/adm1024.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_ADM1025=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_ADM1025.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/adm1025.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_ADM1026=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_ADM1026.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/adm1026.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_ADM9240=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_ADM9240.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/adm9240.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_BT869=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_BT869.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/bt869.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_DDCMON=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_DDCMON.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/ddcmon.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_DS1621=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_DS1621.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/ds1621.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_EEPROM=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_EEPROM.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/eeprom.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_FSCPOS=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_FSCPOS.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/fscpos.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_FSCSCY=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_FSCSCY.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/fscscy.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_GL518SM=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_GL518SM.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/gl518sm.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_GL520SM=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_GL520SM.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/gl520sm.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_IT87=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_IT87.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/it87.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_LM75=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_LM75.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/lm75.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_LM78=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_LM78.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/lm78.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_LM80=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_LM80.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/lm80.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_LM85=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_LM85.*' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/lm85.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_LM87=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_LM87.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/lm87.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_LM92=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_LM92.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/lm92.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_LTC1710=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_LTC1710.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/ltc1710.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_MATORB=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_MATORB.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/matorb.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_MAXILIFE=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_MAXILIFE.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/maxilife.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_MTP008=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_MTP008.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/mtp008.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_PCF8574=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_PCF8574.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/pcf8574.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_PCF8591=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_PCF8591.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/pcf8591.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_SIS5595=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_SIS5595.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/sis5595.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_SMSC47M1=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_SMSC47M1.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/smsc47m1.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_THMC50=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_THMC50.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/thmc50.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_W83781D=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_W83781D.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/w83781d.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_VIA686A=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_VIA686A.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/via686a.o endif -ifneq ($(shell if grep -q '^CONFIG_SENSORS_VT1211=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS_VT1211.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) KERNELCHIPSTARGETS += $(MODULE_DIR)/vt1211.o endif --- kernel-source-sensors-2.8.0/kernel/Module.mk.orig 2003-06-25 14:15:55 +0400 +++ kernel-source-sensors-2.8.0/kernel/Module.mk 2003-06-25 14:16:45 +0400 @@ -24,7 +24,7 @@ # Regrettably, even 'simply expanded variables' will not put their currently # defined value verbatim into the command-list of rules... KERNELTARGETS := -ifneq ($(shell if grep -q '^CONFIG_SENSORS=y' $(LINUX)/.config; then echo 1; fi),1) +ifneq ($(shell if grep -q '^\#define.*CONFIG_SENSORS.*1' $(LINUX_HEADERS)/linux/autoconf.h; then echo 1; fi),1) # sensors.c moved to i2c-proc.c in i2c package #KERNELTARGETS += $(MODULE_DIR)/sensors.o endif --=-=-=--