Skip to content

Commit

Permalink
Merge pull request habitat-sh#3472 from MindNumbing/chef_base_plans_o…
Browse files Browse the repository at this point in the history
…rg_switch

[Various] - Deprecate and modify plans

Admin merging as per overall technical direction to improve Base Plan/Core Plan quality and processes - discussed and described in Design Proposal habitat-sh#3450
  • Loading branch information
Davy McAleer authored Sep 16, 2020
2 parents 28e26b5 + 7556134 commit 7123b14
Show file tree
Hide file tree
Showing 688 changed files with 1,972 additions and 2,353 deletions.
7 changes: 7 additions & 0 deletions .deprecated/acl/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# acl

Commands for Manipulating POSIX Access Control Lists.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/attr/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# attr

Commands for Manipulating Filesystem Extended Attributes

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/autoconf/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# autoconf

Autoconf is an extensible package of M4 macros that produce shell scripts to automatically configure software source code packages.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/automake/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# automake

A tool for automatically generating Makefile.in files compliant with the GNU Coding Standards

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions .deprecated/aws-cli/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# AWS CLI

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/bash/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# bash

Bash is the GNU Project's shell. Bash is the Bourne Again SHell.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/bats/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# bats

Bash Automated Testing System

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
5 changes: 5 additions & 0 deletions .deprecated/bc/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# bc

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions .deprecated/binutils/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# binutils

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/bison/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# bison

A parser generator that converts an annotated context-free grammar into a parser

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions .deprecated/busybox-static/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# busybox-static

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 12 additions & 0 deletions .deprecated/bzip2-musl/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# bzip2-musl

[bzip2][1] is a freely available, patent free (see below), high-quality data compressor.

This package is built with [musl-libc][2].

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)

[1]: http://www.bzip.org/
[2]: https://www.musl-libc.org
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/bzip2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# bzip2

[bzip2][1] is a freely available, patent free (see below), high-quality data compressor.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions .deprecated/cacerts/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# cacerts

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions .deprecated/check/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# check

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
5 changes: 5 additions & 0 deletions .deprecated/clens/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# clens

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/cmake/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# cmake

CMake is an open-source, cross-platform family of tools designed to build, test and package software

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
23 changes: 23 additions & 0 deletions .deprecated/cmake/patches/000-disable_test_file_access.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--- Source/kwsys/testSystemTools.cxx.bak 2019-04-19 18:02:02.444485000 +0000
+++ Source/kwsys/testSystemTools.cxx 2019-04-19 18:02:41.633482000 +0000
@@ -328,13 +328,13 @@
}

// While we're at it, check proper TestFileAccess functionality.
- if (kwsys::SystemTools::TestFileAccess(testNewFile,
- kwsys::TEST_FILE_WRITE)) {
- std::cerr
- << "TestFileAccess incorrectly indicated that this is a writable file:"
- << testNewFile << std::endl;
- res = false;
- }
+ //if (kwsys::SystemTools::TestFileAccess(testNewFile,
+ //kwsys::TEST_FILE_WRITE)) {
+ //std::cerr
+ //<< "TestFileAccess incorrectly indicated that this is a writable file:"
+ //<< testNewFile << std::endl;
+ //res = false;
+ //}

if (!kwsys::SystemTools::TestFileAccess(testNewFile, kwsys::TEST_FILE_OK)) {
std::cerr
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
--- Tests/BundleUtilities/CMakeLists.txt.orig 2019-04-19 20:53:10.039589000 +0000
+++ Tests/BundleUtilities/CMakeLists.txt 2019-04-19 20:53:45.869185000 +0000
@@ -18,65 +18,69 @@
set_target_properties(shared shared2 framework PROPERTIES
SKIP_BUILD_RPATH 1)

-
-###### test a Bundle application using dependencies
-
-# a loadable module (depends on shared2)
-# testbundleutils1 will load this at runtime
-add_library(module1 MODULE module.cpp module.h)
-set_target_properties(module1 PROPERTIES PREFIX "")
-target_link_libraries(module1 shared2)
-
-# a bundle application
-add_executable(testbundleutils1 MACOSX_BUNDLE testbundleutils1.cpp)
-target_link_libraries(testbundleutils1 shared framework ${CMAKE_DL_LIBS})
-
-set_target_properties(testbundleutils1 module1 PROPERTIES
- INSTALL_RPATH "${CMAKE_CURRENT_BINARY_DIR}/testdir1"
- BUILD_WITH_INSTALL_RPATH 1)
-
-# add custom target to install and test the app
-add_custom_target(testbundleutils1_test ALL
- COMMAND ${CMAKE_COMMAND}
- "-DINPUT=$<TARGET_FILE:testbundleutils1>"
- "-DMODULE=$<TARGET_FILE:module1>"
- "-DINPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
- "-DOUTPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/testdir1"
- -P "${CMAKE_CURRENT_SOURCE_DIR}/bundleutils.cmake"
- DEPENDS testbundleutils1 module1
- )
-
-add_dependencies(testbundleutils1_test testbundleutils1)
-
-
-
-###### test a non-Bundle application using dependencies
-
-# a loadable module (depends on shared2)
-# testbundleutils2 will load this at runtime
-add_library(module2 MODULE module.cpp module.h)
-set_target_properties(module2 PROPERTIES PREFIX "")
-target_link_libraries(module2 shared2)
-
-# a non-bundle application
-add_executable(testbundleutils2 testbundleutils2.cpp)
-target_link_libraries(testbundleutils2 shared framework ${CMAKE_DL_LIBS})
-
-set_target_properties(testbundleutils2 module2 PROPERTIES
- INSTALL_RPATH "${CMAKE_CURRENT_BINARY_DIR}/testdir2"
- BUILD_WITH_INSTALL_RPATH 1)
-
-# add custom target to install and test the app
-add_custom_target(testbundleutils2_test ALL
- COMMAND ${CMAKE_COMMAND}
- "-DINPUT=$<TARGET_FILE:testbundleutils2>"
- "-DMODULE=$<TARGET_FILE:module2>"
- "-DINPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
- "-DOUTPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/testdir2"
- -P "${CMAKE_CURRENT_SOURCE_DIR}/bundleutils.cmake"
- DEPENDS testbundleutils1 module2
- )
-add_dependencies(testbundleutils2_test testbundleutils2)
+# The following two tests will always fail in Habitat
+# They have an expectation that there will be no
+# "external" dependencies, which is always faled due to
+# how we utilize LD_RUN_PATH to control runtime linking
+#
+# ###### test a Bundle application using dependencies
+#
+# # a loadable module (depends on shared2)
+# # testbundleutils1 will load this at runtime
+# add_library(module1 MODULE module.cpp module.h)
+# set_target_properties(module1 PROPERTIES PREFIX "")
+# target_link_libraries(module1 shared2)
+#
+# # a bundle application
+# add_executable(testbundleutils1 MACOSX_BUNDLE testbundleutils1.cpp)
+# target_link_libraries(testbundleutils1 shared framework ${CMAKE_DL_LIBS})
+#
+# set_target_properties(testbundleutils1 module1 PROPERTIES
+# INSTALL_RPATH "${CMAKE_CURRENT_BINARY_DIR}/testdir1"
+# BUILD_WITH_INSTALL_RPATH 1)
+#
+# # add custom target to install and test the app
+# add_custom_target(testbundleutils1_test ALL
+# COMMAND ${CMAKE_COMMAND}
+# "-DINPUT=$<TARGET_FILE:testbundleutils1>"
+# "-DMODULE=$<TARGET_FILE:module1>"
+# "-DINPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
+# "-DOUTPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/testdir1"
+# -P "${CMAKE_CURRENT_SOURCE_DIR}/bundleutils.cmake"
+# DEPENDS testbundleutils1 module1
+# )
+#
+# add_dependencies(testbundleutils1_test testbundleutils1)
+#
+#
+#
+# ###### test a non-Bundle application using dependencies
+#
+# # a loadable module (depends on shared2)
+# # testbundleutils2 will load this at runtime
+# add_library(module2 MODULE module.cpp module.h)
+# set_target_properties(module2 PROPERTIES PREFIX "")
+# target_link_libraries(module2 shared2)
+#
+# # # a non-bundle application
+# add_executable(testbundleutils2 testbundleutils2.cpp)
+# target_link_libraries(testbundleutils2 shared framework ${CMAKE_DL_LIBS})
+#
+# set_target_properties(testbundleutils2 module2 PROPERTIES
+# INSTALL_RPATH "${CMAKE_CURRENT_BINARY_DIR}/testdir2"
+# BUILD_WITH_INSTALL_RPATH 1)
+#
+# # add custom target to install and test the app
+# add_custom_target(testbundleutils2_test ALL
+# COMMAND ${CMAKE_COMMAND}
+# "-DINPUT=$<TARGET_FILE:testbundleutils2>"
+# "-DMODULE=$<TARGET_FILE:module2>"
+# "-DINPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
+# "-DOUTPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/testdir2"
+# -P "${CMAKE_CURRENT_SOURCE_DIR}/bundleutils.cmake"
+# DEPENDS testbundleutils1 module2
+# )
+# add_dependencies(testbundleutils2_test testbundleutils2)


if(APPLE AND NOT CMAKE_SYSTEM_VERSION VERSION_LESS 9.0)
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/coreutils/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# coreutils

Basic file, shell and text manipulation utilities of the GNU operating system.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions .deprecated/corretto/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Corretto

Amazon Corretto is a no-cost, multi-platform, production-ready distribution of
the Open Java Development Kit (OpenJDK). The implementation is licensed under
the GNU General Public License version 2 with a Classpath exception.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
9 changes: 9 additions & 0 deletions .deprecated/corretto11/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Corretto 11

Amazon Corretto is a no-cost, multi-platform, production-ready distribution of
the Open Java Development Kit (OpenJDK). The implementation is licensed under
the GNU General Public License version 2 with a Classpath exception.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/corretto8/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Corretto 8

Amazon Corretto is a no-cost, multi-platform, production-ready distribution of the Open Java Development Kit (OpenJDK). The implementation is licensed under the GNU General Public License version 2 with a Classpath exception.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
9 changes: 9 additions & 0 deletions .deprecated/curl/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# curl

This package provides the curl binaries.

[curl](https://curl.haxx.se/) is a tool used in command line or scripts to transfer data.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/cyrus-sasl/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# cyrus-sasl

Cyrus Simple Authentication Service Layer (SASL) library

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions .deprecated/db/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# db

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/dejagnu/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# dejagnu

A framework for testing other programs.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions .deprecated/diffutils/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# diffutils

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/docker/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# docker

The Docker Engine

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/docker17/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# docker 17

The Docker 17 Engine

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/erlang/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# erlang

A programming language for massively scalable soft real-time systems.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions .deprecated/erlang16/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# erlang16

A programming language for massively scalable soft real-time systems.

## Moved

This plan has been moved. For more information see [here](https://github.com/habitat-sh/core-plans#additional-plans)
File renamed without changes.
Loading

0 comments on commit 7123b14

Please sign in to comment.