diff options
| author |   John Mylchreest <johnm@gentoo.org> | 2004-01-21 19:08:12 +0000 |
|---|---|---|
| committer | John Mylchreest <johnm@gentoo.org> | 2004-01-21 19:08:12 +0000 |
| commit | 4ac7064bb7a17cda0dd4b4ea692b5af700bc1df5 (patch) | |
| tree | be218af86f3d7a536ae7a28b4b08a0f0ede11af3 /eclass/kernel-2.eclass | |
| parent | Tweak livecd support. Add selinux patch from Chris PeBenito (diff) | |
| download | gentoo-2-4ac7064bb7a17cda0dd4b4ea692b5af700bc1df5.tar.gz gentoo-2-4ac7064bb7a17cda0dd4b4ea692b5af700bc1df5.tar.bz2 gentoo-2-4ac7064bb7a17cda0dd4b4ea692b5af700bc1df5.zip | |
updating to support .diff extensions, and to strip .extention from outputted file.
Diffstat (limited to 'eclass/kernel-2.eclass')
| -rw-r--r-- | eclass/kernel-2.eclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 62f7232561b0..e11fdc713250 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -280,11 +280,14 @@ unipatch() { case ${extention} in bz2) PIPE_CMD="bzip2 -dc";; patch) PIPE_CMD="cat";; + diff) PIPE_CMD="cat";; gz|Z|z) PIPE_CMD="gzip -dc";; ZIP|zip) PIPE_CMD="unzip -p";; *) UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} ${i}";; esac - [ -n "${PIPE_CMD}" ] && ${PIPE_CMD} ${i} > ${KPATCH_DIR}/${i/*\//}.patch + x=${i/*\//} + x=${x/\.${extention}/} + [ -n "${PIPE_CMD}" ] && ${PIPE_CMD} ${i} > ${KPATCH_DIR}/${x}.patch done #populate KPATCH_DIRS so we know where to look to remove the excludes @@ -312,7 +315,7 @@ unipatch() { # and now, finally, we patch it :) for x in ${KPATCH_DIR} do - for i in $(find ${x} -maxdepth 1 -iname "*.patch" | sort -u) + for i in $(find ${x} -maxdepth 1 -iname "*.patch" -or -iname "*.diff" | sort -u) do |