From ca5c55acb366ff5f80af00737a8110673ccf252b Mon Sep 17 00:00:00 2001
From: Andrii Pientsov <andrii.pientsov@globallogic.com>
Date: Thu, 21 May 2020 09:08:42 +0300
Subject: Remove duplicates

---
 conf/distro/java.inc    | 11 -------
 conf/distro/mlinux.conf | 77 -------------------------------------------------
 2 files changed, 88 deletions(-)
 delete mode 100644 conf/distro/java.inc
 delete mode 100644 conf/distro/mlinux.conf

(limited to 'conf')

diff --git a/conf/distro/java.inc b/conf/distro/java.inc
deleted file mode 100644
index 6980075..0000000
--- a/conf/distro/java.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-
-#PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
-
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
-
-#PREFERRED_VERSION_openjdk-7-jre = "25b30-2.3.12"
-#PREFERRED_VERSION_icedtea7-native = "2.1.3"
-
-#PREFERRED_PROVIDER_openjdk-7-jre = "openjdk-7-jre"
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
deleted file mode 100644
index 98ee5be..0000000
--- a/conf/distro/mlinux.conf
+++ /dev/null
@@ -1,77 +0,0 @@
-DISTRO = "mlinux"
-DISTRO_NAME = "mLinux"
-#DISTRO_BASE_VERSION = "5.0"
-DISTRO_BASE_VERSION = "6.0"
-#DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev34"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev1"
-DISTRO_CODENAME = ""
-SDK_VENDOR = "-mlinux"
-SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
-SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}"
-SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
-
-# add static libs to toolchain builds
-SDKIMAGE_FEATURES = "dev-pkgs dbg-pkgs staticdev-pkgs"
-
-MAINTAINER = "MultiTech Systems <oe-devel@multitech.net>"
-
-TARGET_VENDOR = "-mlinux"
-
-LOCALCONF_VERSION = "1"
-LAYER_CONF_VERSION ?= "6"
-
-DISTRO_FEATURES_MLINUX = "argp largefile xattr \
-                           ipv6 ipsec ppp \
-                           bluetooth irda usbgadget usbhost wifi \
-                           cramfs ext2 smbfs nfs \
-                           libc-crypt pam \
-                           sysvinit x11"
-DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_MLINUX}"
-
-# disable pulseaudio
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
-
-# extra packages to add to images
-DISTRO_EXTRA_RDEPENDS += "mlinux-version"
-
-# add mlinux source mirror
-INHERIT += "mlinux-mirrors"
-
-# Package feed configuration
-DISTRO_FEED_URI = "http://multitech.net/mlinux/feeds/${DISTRO_VERSION}"
-DISTRO_FEED_PREFIX = "mlinux"
-
-EXTRAOPKGCONFIG = ""
-
-# don't append to tmpdir
-TCLIBCAPPEND = ""
-
-IPKG_VARIANT = "opkg"
-DEFAULT_TIMEZONE = "America/Chicago"
-
-# default mtadm password
-MTADM_PASSWORD_HASH ?= "e97PZLy9l09O6"
-
-SANITY_TESTED_DISTROS ?= " \
-            Ubuntu-14.04 \n \
-            Ubuntu-14.10 \n \
-            Ubuntu-15.04 \n \
-            Ubuntu-15.10 \n \
-            Ubuntu-16.04 \n \
-            Fedora-22 \n \
-            Fedora-23 \n \
-            Fedora-24 \n \
-            CentOSLinux-7.* \n \
-            Debian-8.* \n \
-            openSUSE-13.2 \n \
-            SUSELINUX-42.1 \n \
-            "
-
-PREFERRED_PROVIDER_jpeg = "jpeg"
-PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
-require java.inc
-
-PREFERRED_VERSION_nodejs ?= "10.%"
-PREFERRED_VERSION_nodejs-native ?= "10.%"
-
-PREFERRED_VERSION_gpsd ?= "3.18.%"
-- 
cgit v1.2.3