diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-06-23 01:58:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-06-23 01:58:32 -0300 |
| commit | 3fabd61dd8b4ce0e9d89e668755b4c7b05ab4211 (patch) | |
| tree | fc9446f3c2b29e69d7ad85bea0bd0a5d09000cc7 | |
| parent | 8fe1b7a317e24c53d14e7973a42df19529508d7a (diff) | |
| parent | ce5748cfbb0123d405206c033d3db246ad80d04e (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/linux-2.6-ARCH
Conflicts:
PATCHCFG
| -rw-r--r-- | PATCHCFG | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1,7 +1,8 @@ # Kernel source file -SRC="http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.39-libre/linux-2.6.39-libre.tar.bz2" +KVER=2.6.39.1 +SRC="http://linux-libre.fsfla.org/pub/linux-libre/releases/${KVER}-libre/linux-${KVER}-libre.tar.bz2" # Original source directory -SRCORIG="linux-2.6.39" +SRCORIG="linux-${KVER}" # Our source directory SRCNAME="linux-2.6.39-LIBRE" # Patches: @@ -22,7 +23,7 @@ PATCHES=( # aufs2-standalone-20110519.patch%1 ) # Name of the resulting patch (will be bzipped afterwards) -PATCHNAME="patch-2.6.39-1-LIBRE" +PATCHNAME="patch-${KVER}-1-LIBRE" # Run this before applying patches pre_apply() { @@ -36,7 +37,7 @@ post_apply() { # this way, minor kernel updates will not break external modules sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION = |g' Makefile - # Add Arch logo! + # Add Linux-Libre logo! cp ${startdir}/patches/logo_linux_clut224.ppm drivers/video/logo/ cp ${startdir}/patches/logo_linux_mono.pbm drivers/video/logo/ cp ${startdir}/patches/logo_linux_vga16.ppm drivers/video/logo/ |