conf/distro/oplinux.conf : Make oplinux distro provide all availiable types of images

Move image definitios to oplinux.inc as it is common both for oplinux and oplinux-uclibc

3 files changed, 69 insertions, 25 deletions

diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc
index ecf08322fa..a700a830b8 100644
--- a/conf/distro/include/oplinux.inc
+++ b/conf/distro/include/oplinux.inc
@@ -12,6 +12,20 @@ INHERIT += "multimachine"
 INHERIT += "sanity"
 
 
+#
+# Naming schemes
+#
+PARALLEL_INSTALL_MODULES = "1"
+INHERIT += "package_ipk debian"
+
+#
+# Packaging and output format
+
+IMAGE_FSTYPES = "tar jffs2 ext2 cramfs squashfs squashfs-lzma cpio.gz"
+
+
+
+
 # Specifies a location to search for pre-generated tarballs when fetching
 # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS.
 #CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/source/current/"
@@ -35,7 +49,8 @@ PREFERRED_PROVIDER_task-bootstrap = "task-base"
 DISTRO_FEATURES = "nfs smbfs ext2 pcmcia usbgadget usbhost pci"
 
 
-OPLINUX_URI = "http://www.ifaistos.awmn"
+OPLINUX_URI = "http://www.ifaistos.awmn/oplinux"
+OPLINUX-uCLIBC_URI = "http://www.ifaistos.awmn/oplinux-uclibc"
 
 #Dir config
 IMAGE_ROOTFS = "${TMPDIR}/rootfs/${MACHINE}"
diff --git a/conf/distro/oplinux-uclibc.conf b/conf/distro/oplinux-uclibc.conf
index 2ab34603e6..0d31c8c8ac 100644
--- a/conf/distro/oplinux-uclibc.conf
+++ b/conf/distro/oplinux-uclibc.conf
@@ -17,7 +17,6 @@
 require conf/distro/include/oplinux.inc
 require conf/distro/include/sane-srcdates.inc
 
-
 #
 # Header
 #
@@ -34,17 +33,6 @@ PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
 PREFERRED_PROVIDER_virtual/libintl = "libintl"
 
 #
-# Naming schemes
-#
-PARALLEL_INSTALL_MODULES = "1"
-INHERIT += "package_ipk debian"
-
-#
-# Packaging and output format
-
-IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
-
-#
 # Kernel
 #
 KERNEL = "kernel26"
@@ -79,3 +67,29 @@ DISTRO_EXTRA_RDEPENDS += "\
                          nano pciutils"
 
 
+
+
+FEED_ARCH ?= "${TARGET_ARCH}"
+
+#i486 machines          
+FEED_ARCH_x86           ="i486"
+
+#i586 machines
+FEED_ARCH_epia          = "i586"
+
+#i686 machines
+FEED_ARCH_guinness      = "i686"
+FEED_ARCH_progear       = "i686"
+
+#powerpc machines
+FEED_ARCH_efika         = "ppc603e"
+FEED_ARCH-dht-walnut    = "ppc405"
+
+
+FEED_URIS += " \
+                no-arch##${OPLINUX-uCLIBC_URI}/unstable/feed/all \
+                base##${OPLINUX-uCLIBC_URI}/unstable/feed/${FEED_ARCH}/base \
+                perl##${OPLINUX-uCLIBC_URI}/unstable/feed/${FEED_ARCH}/perl \
+                python##${OPLINUX-uCLIBC_URI}/unstable/feed/${FEED_ARCH}/python \
+                debug##${OPLINUX-uCLIBC_URI}/unstable/feed/${FEED_ARCH}/debug \
+                ${MACHINE}##${OPLINUX-uCLIBC_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
diff --git a/conf/distro/oplinux.conf b/conf/distro/oplinux.conf
index 61756239e0..d3e6c0344d 100644
--- a/conf/distro/oplinux.conf
+++ b/conf/distro/oplinux.conf
@@ -30,18 +30,6 @@ DISTRO_TYPE = "debug"
 # Target OS & FPU system
 #
 TARGET_OS = "linux"
-#
-# Naming schemes
-#
-PARALLEL_INSTALL_MODULES = "1"
-INHERIT += "package_ipk debian"
-
-#
-# Packaging and output format
-
-IMAGE_FSTYPES = "tar.gz ext2.gz"
-
-
 
 PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
@@ -128,4 +116,31 @@ DISTRO_EXTRA_RDEPENDS += "\
 
 
 
+FEED_ARCH ?= "${TARGET_ARCH}"
+
+#i486 machines          
+FEED_ARCH_x86		="i486"
+
+#i586 machines
+FEED_ARCH_epia          = "i586"
+
+#i686 machines
+FEED_ARCH_guinness      = "i686"
+FEED_ARCH_progear       = "i686"
+
+#powerpc machines
+FEED_ARCH_efika         = "ppc603e"
+FEED_ARCH_dht-walnut    = "ppc405"
+
+
+FEED_URIS += " \
+                no-arch##${OPLINUX_URI}/unstable/feed/all \
+                base##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/base \
+                perl##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/perl \
+                python##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/python \
+                debug##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/debug \
+                ${MACHINE}##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
+
+
+