Skip to contentSkip to conversation

adt-installer: Drop since its replaced by the extensible SDK

PATCH New Richard Purdie 1 participant 1 message Feb 17, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 adt-installer: Drop since its replaced by the extensible SDK

The extensible SDK replaces adt-installer so this can be removed now, all future effort in this direction will be placed onto that.

This includes a layer version change so the autobuilder knows when to stop building adt-installer.

[YOCTO #6404]

meta/conf/conf-notes.txt +0 -1
index 66e6319..2f2932b 100644
@@ -2,7 +2,6 @@ Common targets are:
     core-image-minimal
     core-image-sato
     meta-toolchain
-    adt-installer
     meta-ide-support
 
 You can also run generated qemu images with a command like 'runqemu qemux86'
meta/conf/distro/include/distro_alias.inc +0 -1
index c2ad07e2..d37aefb 100644
@@ -9,7 +9,6 @@
 #
 # Please keep this list in alphabetical order.
 #
-DISTRO_PN_ALIAS_pn-adt-installer = "Intel"
 DISTRO_PN_ALIAS_pn-alsa-state = "OE-Core"
 DISTRO_PN_ALIAS_pn-alsa-utils-alsaconf = "OE-Core"
 DISTRO_PN_ALIAS_pn-alsa-utils-scripts = "OE-Core"
meta/conf/layer.conf +1 -1
index a892fba..8ee61aa 100644
@@ -9,7 +9,7 @@ BBFILE_PRIORITY_core = "5"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
-LAYERVERSION_core = "7"
+LAYERVERSION_core = "8"
 
 BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
 
meta/recipes-core/meta/meta-world-pkgdata.bb +1 -1
index 48a9027..3c5db50 100644
@@ -33,7 +33,7 @@ do_install[noexec] = "1"
 
 do_configure[deptask] = ""
 
-WORLD_PKGDATA_EXCLUDE ?= "adt-installer"
+WORLD_PKGDATA_EXCLUDE ?= ""
 
 python calculate_extra_depends() {
     exclude = '${WORLD_PKGDATA_EXCLUDE}'.split()
meta/recipes-devtools/installer/adt-installer/adt_installer deleted +0 -420

420 lines not on this page · raw message

meta/recipes-devtools/installer/adt-installer/adt_installer.conf deleted +0 -75

75 lines not on this page · raw message

meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf deleted +0 -6
deleted file mode 100644
index ba627b3..0000000
@@ -1,6 +0,0 @@
-arch all 1
-arch any 6
-arch noarch 11
-arch i686-nativesdk 16
-src yp-i686-nativesdk ADTREPO_URL/adt-ipk/i686-nativesdk
-src yp-i686-all ADTREPO_URL/adt-ipk/all
meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf deleted +0 -6
deleted file mode 100644
index 10504a9..0000000
@@ -1,6 +0,0 @@
-arch all 1
-arch any 6
-arch noarch 11
-arch x86_64-nativesdk 16
-src yp-x86_64-nativesdk ADTREPO_URL/adt-ipk/x86_64-nativesdk
-src yp-x86_64-all ADTREPO_URL/adt-ipk/all
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal deleted +0 -312

312 lines not on this page · raw message

meta/recipes-devtools/installer/adt-installer/scripts/data_define deleted +0 -38
deleted file mode 100644
index cfd6716..0000000
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# Yocto ADT Installer
-#
-# Copyright 2010-2011 by Intel Corp.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy 
-# of this software and associated documentation files (the "Software"), to deal 
-# in the Software without restriction, including without limitation the rights 
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-# copies of the Software, and to permit persons to whom the Software is 
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in 
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-# THE SOFTWARE.
-
-config_file="adt_installer.conf"
-source `pwd`/$config_file
-
-LOCAL_OPKG_LOC="./opkg/build/opkg"
-LOCAL_OPKG_FOLDER="./opkg/build"
-
-# List all supported root fs types and target types,
-# it will be used in user configuration validity checking
-YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk"
-YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm ppc mips"
-# Different host (32 bit or 64 bit) will have different opkg
-# configuration files
-YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf"
-YOCTOADT_OPKG_CONF_FILE_64="./opkg/conf/opkg-sdk-x86_64.conf"
meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs deleted +0 -67

67 lines not on this page · raw message

meta/recipes-devtools/installer/adt-installer/scripts/util deleted +0 -104

104 lines not on this page · raw message

meta/recipes-devtools/installer/adt-installer_1.0.bb deleted +0 -94

94 lines not on this page · raw message

meta/recipes-devtools/installer/files/wget_cache.patch deleted +0 -21
deleted file mode 100644
index 9117510..0000000
@@ -1,21 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- libopkg/opkg_download_wget.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libopkg/opkg_download_wget.c b/libopkg/opkg_download_wget.c
-index 9001493..18ef91e 100644
---- a/libopkg/opkg_download_wget.c
-+++ b/libopkg/opkg_download_wget.c
-@@ -50,6 +50,7 @@ int opkg_download_backend(const char *src, const char *dest,
- 
-     argv[i++] = "wget";
-     argv[i++] = "-q";
-+    argv[i++] = "--no-cache";
-     if (opkg_config->http_proxy || opkg_config->ftp_proxy) {
-         argv[i++] = "-Y";
-         argv[i++] = "on";
--- 
-1.9.1
-