diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2014-01-17 13:45:19 -0600 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2014-01-17 13:45:19 -0600 |
| commit | 382a32756eaace2dd933426f5411cff4e111b70a (patch) | |
| tree | 5b3da2b007e814c89a33bdeed0ce30cf5956cfa9 /multitech/recipes/linux/linux_2.6.39-at91.bb | |
| parent | 1e2d685cc07a2c3c8165662e7c0ebeb19cb1c16d (diff) | |
| parent | f88e1a39ae0758897f6c9680d27920d915c36952 (diff) | |
Merge branch 'mtocgd' into mtocgd-2.3.2
Conflicts:
multitech/recipes/images/corecdp-tftpboot.inc
multitech/recipes/linux/linux_2.6.39-at91.bb
Diffstat (limited to 'multitech/recipes/linux/linux_2.6.39-at91.bb')
| -rw-r--r-- | multitech/recipes/linux/linux_2.6.39-at91.bb | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/multitech/recipes/linux/linux_2.6.39-at91.bb b/multitech/recipes/linux/linux_2.6.39-at91.bb index 41c369e..75c3d48 100644 --- a/multitech/recipes/linux/linux_2.6.39-at91.bb +++ b/multitech/recipes/linux/linux_2.6.39-at91.bb @@ -13,10 +13,7 @@ SRC_URI = "git://github.com/linux4sam/linux-at91.git;protocol=https;tag=${SRCREV S = "${WORKDIR}/git" -SRC_URI_append_mtocgd3 = " \ - file://defconfig \ - file://linux-2.6.39.4-mach-at91-mtocgd3.patch \ - file://linux-2.6.39.4-macb-force-link.patch \ +COMMON_PATCHES = " \ file://linux-2.6.39.4-ledtrig-netdev.patch \ file://linux-2.6.39.4-at91sam9x5-extreset.patch \ file://linux-2.6.39.4-atmel-mci-force-detect.patch \ @@ -32,6 +29,19 @@ SRC_URI_append_mtocgd3 = " \ file://linux-2.6.39.4-cdc-acm-ignore-exar-devices.patch \ " +SRC_URI_append_mtocgd3 = " \ + file://defconfig \ + file://linux-2.6.39.4-mach-at91-mtocgd3.patch \ + file://linux-2.6.39.4-macb-force-link.patch \ + ${COMMON_PATCHES} \ + " + +SRC_URI_append_mtocgd = " \ + file://defconfig \ + file://linux-2.6.39.4-mach-at91-mtocgd.patch \ + ${COMMON_PATCHES} \ + " + # prevent setlocalversion from changing kernel version do_configure_prepend() { touch ${S}/.scmversion |