Merge branch 'master' of github.com:SIFTeam/openembedded

SIFTeam · Mar 18, 2012 · afcddce · afcddce
2 parents 0abf547 + 1ca26f7
commit afcddce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/conf/machine/azboxhd.conf b/conf/machine/azboxhd.conf
@@ -6,6 +6,7 @@ PREFERRED_VERSION_linux-azboxhd = "2.6.22"
 PREFERRED_VERSION_linux-libc-headers = "2.6.22"
 PREFERRED_VERSION_wpa-supplicant = "0.4.9"
 PREFERRED_VERSION_madwifi-ng = "r3314-20080131"
+PREFERRED_VERSION_jpeg = "6b"
 
 #take care when you do changes on MACHINE_ESSENTIAL_EXTRA_RDEPENDS/RRECOMMENDS you have to increment the recipes/tasks/task-boot.bb PR
 

diff --git a/conf/machine/azboxme.conf b/conf/machine/azboxme.conf
@@ -6,6 +6,8 @@ PREFERRED_VERSION_linux-azboxme = "2.6.22"
 PREFERRED_VERSION_linux-libc-headers = "2.6.22"
 PREFERRED_VERSION_wpa-supplicant = "0.4.9"
 PREFERRED_VERSION_madwifi-ng = "r3314-20080131"
+PREFERRED_VERSION_jpeg = "6b"
+
 
 #take care when you do changes on MACHINE_ESSENTIAL_EXTRA_RDEPENDS/RRECOMMENDS you have to increment the recipes/tasks/task-boot.bb PR