Archives
Archives
| From: | "Matt Turner (mattst88)" <mattst88@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo commit in src/patchsets/gentoo-headers: rip-headers.sh |
| Date: | Sun, 10 Sep 2017 23:55:00 |
| Message-Id: | 20170910235457.F0F86906C@oystercatcher.gentoo.org |
| 1 | mattst88 17/09/10 23:54:57 |
| 2 | |
| 3 | Modified: rip-headers.sh |
| 4 | Log: |
| 5 | Update rip-headers.sh to handle kernels >= 4.12 |
| 6 | |
| 7 | Upstream kernel commit fcc8487d477a3452a1d0ccbdd4c5e0e1e3cb8bed ("uapi: export |
| 8 | all headers under uapi directories") removed include/Kbuild and the Kbuild |
| 9 | files from most directories within include/, thus breaking rip-headers.sh. |
| 10 | |
| 11 | I have modified rip-headers.sh to simply rip all of include/ if it cannot find |
| 12 | the Kbuild files. This increase the size of gentoo-headers-base-*.tar.xz from |
| 13 | ~4M to ~8M, but that's still significantly better than the size of the whole |
| 14 | kernel. |
| 15 | |
| 16 | Revision Changes Path |
| 17 | 1.16 src/patchsets/gentoo-headers/rip-headers.sh |
| 18 | |
| 19 | file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/rip-headers.sh?rev=1.16&view=markup |
| 20 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/rip-headers.sh?rev=1.16&content-type=text/plain |
| 21 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/rip-headers.sh?r1=1.15&r2=1.16 |
| 22 | |
| 23 | Index: rip-headers.sh |
| 24 | =================================================================== |
| 25 | RCS file: /var/cvsroot/gentoo/src/patchsets/gentoo-headers/rip-headers.sh,v |
| 26 | retrieving revision 1.15 |
| 27 | retrieving revision 1.16 |
| 28 | diff -u -r1.15 -r1.16 |
| 29 | --- rip-headers.sh 2 Aug 2016 15:22:58 -0000 1.15 |
| 30 | +++ rip-headers.sh 10 Sep 2017 23:54:57 -0000 1.16 |
| 31 | @@ -28,8 +28,13 @@ |
| 32 | mkdir ${dst} |
| 33 | cp ${src}/Makefile ${dst}/ |
| 34 | mkdir ${dst}/include |
| 35 | -cp ${src}/include/Kbuild ${dst}/include/ |
| 36 | -cp -r $(find ${src}/include -mindepth 2 -maxdepth 2 -name 'Kbuild*' -printf %h' ') ${dst}/include/ |
| 37 | +[ -f ${src}/include/Kbuild ] && cp ${src}/include/Kbuild ${dst}/include/ |
| 38 | +directories=$(find ${src}/include -mindepth 2 -maxdepth 2 -name 'Kbuild*' -printf %h' ') |
| 39 | +if [ -n "${directories}" ] ; then |
| 40 | + cp -r ${directories} ${dst}/include/ |
| 41 | +else |
| 42 | + cp -r ${src}/include/* ${dst}/include |
| 43 | +fi |
| 44 | mkdir ${dst}/scripts |
| 45 | cp -r \ |
| 46 | ${src}/scripts/{Makefile,Kbuild}* \ |