summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2013-04-18 16:56:20 -0500
committerJesse Gilles <jgilles@multitech.com>2013-04-18 16:56:20 -0500
commite54bb89f2af58563f073ef7722b63aad70c8a33c (patch)
tree6a67959861cb67d5e19457c9fecc80882d2ead22
parentb3b491cb136c0058b54d8d5f5b20a1280b901fdc (diff)
parent289ad509d5cfc463dd1c8eb95b57479ff383cb06 (diff)
Merge branch 'master' of git.multitech.net:corecdp
-rw-r--r--multitech/recipes/base-files/base-files_3.0.14.bbappend2
-rw-r--r--multitech/recipes/images/corecdp-wifi-ap-image.bb2
2 files changed, 3 insertions, 1 deletions
diff --git a/multitech/recipes/base-files/base-files_3.0.14.bbappend b/multitech/recipes/base-files/base-files_3.0.14.bbappend
index 18e475d..111d19e 100644
--- a/multitech/recipes/base-files/base-files_3.0.14.bbappend
+++ b/multitech/recipes/base-files/base-files_3.0.14.bbappend
@@ -1,7 +1,7 @@
FILESEXTRA := "${THISDIR}"
FILESPATHBASE =. "${FILESEXTRA}:"
-PR .= ".corecdp${DISTRO_VERSION}.1"
+PR .= ".corecdp${DISTRO_VERSION}.2"
dirs755_corecdp = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
${sysconfdir}/skel /lib /mnt /sys /proc /home/root /sbin \
diff --git a/multitech/recipes/images/corecdp-wifi-ap-image.bb b/multitech/recipes/images/corecdp-wifi-ap-image.bb
index c72b882..9614859 100644
--- a/multitech/recipes/images/corecdp-wifi-ap-image.bb
+++ b/multitech/recipes/images/corecdp-wifi-ap-image.bb
@@ -2,6 +2,8 @@ require corecdp-base-image.bb
IMAGE_INSTALL += " \
hostap-daemon hostap-utils \
+ocg-scripts \
+wl12xx-scripts \
"
export IMAGE_BASENAME = "corecdp-wifi-ap-image"