[oe-commits] org.oe.dev conf/distro/oplinux.conf : Make oplinux distro provide all availiable types of images

[ifaistos commit]

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

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: ab6f5dba68f0383174a48de93c98e18844c92aa1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ab6f5dba68f0383174a48de93c98e18844c92aa1
Files:
1
conf/distro/include/oplinux.inc
conf/distro/oplinux-uclibc.conf
conf/distro/oplinux.conf
Diffs:

#
# mt diff -r474c35ac2b30977b295520e8e601f7b20650310e -rab6f5dba68f0383174a48de93c98e18844c92aa1
#
# 
# 
# patch "conf/distro/include/oplinux.inc"
#  from [4fb2d109ae273b48184e00c0db52da970d37381b]
#    to [171f198e02178576f3f1d61b081a13e4949a6b6c]
# 
# patch "conf/distro/oplinux-uclibc.conf"
#  from [81f68004467d4a44807246bad885fa65e97b70f5]
#    to [4d4e43572601100e99436c766449cf726eab951e]
# 
# patch "conf/distro/oplinux.conf"
#  from [4b62433ae96069ce5c1931771fc92e4735111292]
#    to [2107c18ff800955bc6522e1dc8bfe28f31c58ab7]
# 
============================================================
--- conf/distro/include/oplinux.inc	4fb2d109ae273b48184e00c0db52da970d37381b
+++ conf/distro/include/oplinux.inc	171f198e02178576f3f1d61b081a13e4949a6b6c
@@ -12,6 +12,20 @@ INHERIT += "sanity"
 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 @@ DISTRO_FEATURES = "nfs smbfs ext2 pcmcia
 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}"
============================================================
--- conf/distro/oplinux-uclibc.conf	81f68004467d4a44807246bad885fa65e97b70f5
+++ conf/distro/oplinux-uclibc.conf	4d4e43572601100e99436c766449cf726eab951e
@@ -17,7 +17,6 @@ require conf/distro/include/sane-srcdate
 require conf/distro/include/oplinux.inc
 require conf/distro/include/sane-srcdates.inc
 
-
 #
 # Header
 #
@@ -34,17 +33,6 @@ PREFERRED_PROVIDER_virtual/libintl = "li
 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}"
============================================================
--- conf/distro/oplinux.conf	4b62433ae96069ce5c1931771fc92e4735111292
+++ conf/distro/oplinux.conf	2107c18ff800955bc6522e1dc8bfe28f31c58ab7
@@ -30,19 +30,7 @@ TARGET_OS = "linux"
 # 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"
 PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-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}"
+
+
+
+