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/multitech | |
| 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/multitech')
| -rw-r--r-- | multitech/recipes/multitech/mts-io_0.6.2.bb | 7 | ||||
| -rw-r--r-- | multitech/recipes/multitech/mts-io_0.6.3.bb | 15 |
2 files changed, 19 insertions, 3 deletions
diff --git a/multitech/recipes/multitech/mts-io_0.6.2.bb b/multitech/recipes/multitech/mts-io_0.6.2.bb index 3ed8918..1ebe062 100644 --- a/multitech/recipes/multitech/mts-io_0.6.2.bb +++ b/multitech/recipes/multitech/mts-io_0.6.2.bb @@ -1,14 +1,15 @@ require mts-io.inc -TAG="v0.6.2" +TAG="d5beeadc07864a4bdc970ed76bd4693529039fcd" SRC_URI = " \ file://mts-io.init \ file://radio-reset-h5 \ - git://git.multitech.net/cdp-io-controller.git;protocol=git;branch=master;tag=${TAG} \ +# git://git.multitech.net/cdp-io-controller.git;protocol=git;branch=master;tag=${TAG} \ + git://sw.multitech.prv/usr/local/git/jjg/cdp-io-controller.git;protocol=ssh;branch=mtocgd;tag=${TAG} \ " SRC_URI_append_mt100eocg-pcie-dk = "file://mts-io-0.6.2-pcieh5.patch" -LOCAL_PR = "${INC_PR}.1" +LOCAL_PR = "${INC_PR}.3" MACHINE_KERNEL_PR_append = "${LOCAL_PR}" diff --git a/multitech/recipes/multitech/mts-io_0.6.3.bb b/multitech/recipes/multitech/mts-io_0.6.3.bb new file mode 100644 index 0000000..f0899f4 --- /dev/null +++ b/multitech/recipes/multitech/mts-io_0.6.3.bb @@ -0,0 +1,15 @@ +require mts-io.inc + +TAG="1e70cdd4f9beb991c46b56b8da49f39f60796851" + +SRC_URI = " \ + file://mts-io.init \ + file://radio-reset-h5 \ +# git://git.multitech.net/cdp-io-controller.git;protocol=git;branch=master;tag=${TAG} \ + git://sw.multitech.prv/usr/local/git/jjg/cdp-io-controller.git;protocol=ssh;branch=mtocgd;tag=${TAG} \ +" + +SRC_URI_append_mt100eocg-pcie-dk = "file://mts-io-0.6.2-pcieh5.patch" + +LOCAL_PR = "${INC_PR}.1" +MACHINE_KERNEL_PR_append = "${LOCAL_PR}" |