Message ID | 20230411180016.14341-1-afd@ti.com |
---|---|
State | Accepted |
Delegated to: | Ryan Eatmon |
Headers | show |
Series | [meta-arago,master/kirkstone] branding: Remove old AM/GL/MC SDKs | expand |
On Tue, Apr 11, 2023 at 01:00:16PM -0500, Andrew Davis via lists.yoctoproject.org wrote: > These have not been used nor updated in a long time. They point > to old and/or non-existent versions of packages. Drop them. > > Signed-off-by: Andrew Davis <afd@ti.com> Acked-by: Denys Dmytriyenko <denys@konsulko.com> > --- > .../conf/distro/include/branding-amsdk.inc | 31 ------------------- > .../conf/distro/include/branding-glsdk.inc | 11 ------- > .../conf/distro/include/branding-mcsdk.inc | 18 ----------- > 3 files changed, 60 deletions(-) > delete mode 100644 meta-arago-distro/conf/distro/include/branding-amsdk.inc > delete mode 100644 meta-arago-distro/conf/distro/include/branding-glsdk.inc > delete mode 100644 meta-arago-distro/conf/distro/include/branding-mcsdk.inc > > diff --git a/meta-arago-distro/conf/distro/include/branding-amsdk.inc b/meta-arago-distro/conf/distro/include/branding-amsdk.inc > deleted file mode 100644 > index 96df5660..00000000 > --- a/meta-arago-distro/conf/distro/include/branding-amsdk.inc > +++ /dev/null > @@ -1,31 +0,0 @@ > -ARAGO_TISDK_IMAGE = "arago-amsdk-image" > - > -PREFERRED_PROVIDER_virtual/kernel:am335x-evm = "sitara-linux-ti-staging" > -PREFERRED_PROVIDER_virtual/kernel:am437x-evm = "sitara-linux-ti-staging" > -PREFERRED_VERSION_sitara-linux-ti-staging = "3.14%" > - > -# To create newlines in the message \n is used and the slash must be escaped > -# to function properly > - > -SRCIPK_GIT_COMMIT_MESSAGE = "\ > -Create local branch\\n\ > -\\n\ > -The below commit is used for this local branch and is the one used by\\n\ > -this sdk:\\n\ > -${SRCREV}." > - > -SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE ="${SRCIPK_GIT_COMMIT_MESSAGE}\\n\\n\ > -To reduce the size of the SDK installer only a portion of the git commit\\n\ > -history has been preserved. Also links to remote branches and tags do\\n\ > -not exist in this copy of the repository.\\n\ > -To fix this please run the unshallow-repositories.sh\\n\ > -script located in the sdk\'s bin directory\\n\ > -\\n\ > -The script may take several minutes but you will then have a full copy of\\n\ > -the git repository including its entire git history.\\n" > - > -SRCIPK_CUSTOM_GIT_BRANCH:pn-sitara-linux-ti-staging = "amsdk-8.0" > -SRCIPK_CUSTOM_GIT_MESSAGE:pn-sitara-linux-ti-staging = "${SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE}" > - > -SRCIPK_CUSTOM_GIT_BRANCH:pn-u-boot-ti-staging = "amsdk-8.0" > -SRCIPK_CUSTOM_GIT_MESSAGE:pn-u-boot-ti-staging = "${SRCIPK_GIT_COMMIT_MESSAGE}" > diff --git a/meta-arago-distro/conf/distro/include/branding-glsdk.inc b/meta-arago-distro/conf/distro/include/branding-glsdk.inc > deleted file mode 100644 > index 0abd73cc..00000000 > --- a/meta-arago-distro/conf/distro/include/branding-glsdk.inc > +++ /dev/null > @@ -1,11 +0,0 @@ > -# GLSDK branding configuration > - > -# Use the SDK supported kernel and kernel version > -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-glsdk" > - > -PREFERRED_PROVIDER_virtual/bootloader:omap-a15 = "u-boot-ti-staging" > -PREFERRED_PROVIDER_u-boot:omap-a15 = "u-boot-ti-staging" > - > -# Set the PREFERRED_VERSION of libdrm to the glsdk version for the > -# glsdk branded builds > -PREFERRED_VERSION_libdrm = "2.4.41" > diff --git a/meta-arago-distro/conf/distro/include/branding-mcsdk.inc b/meta-arago-distro/conf/distro/include/branding-mcsdk.inc > deleted file mode 100644 > index 7dbffd3a..00000000 > --- a/meta-arago-distro/conf/distro/include/branding-mcsdk.inc > +++ /dev/null > @@ -1,18 +0,0 @@ > -# MCSDK branding configuration > - > -# Use the MCSDK supported versions > -PREFERRED_VERSION_libnl = "3.2.24" > - > -DISTRO_FEATURES += "x11" > - > -# Java preferences. > -PREFERRED_VERSION_icedtea7-native = "2.1.3" > -PREFERRED_PROVIDER_openjdk-7-jre = "openjdk-7-jre" > - > -PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" > - > -PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" > -PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" > - > -PREFERRED_PROVIDER_jpeg-native = "jpeg-native" > -PREFERRED_PROVIDER_glibc-gconv-iso8859-1 = "glibc-locale" > -- > 2.39.2
diff --git a/meta-arago-distro/conf/distro/include/branding-amsdk.inc b/meta-arago-distro/conf/distro/include/branding-amsdk.inc deleted file mode 100644 index 96df5660..00000000 --- a/meta-arago-distro/conf/distro/include/branding-amsdk.inc +++ /dev/null @@ -1,31 +0,0 @@ -ARAGO_TISDK_IMAGE = "arago-amsdk-image" - -PREFERRED_PROVIDER_virtual/kernel:am335x-evm = "sitara-linux-ti-staging" -PREFERRED_PROVIDER_virtual/kernel:am437x-evm = "sitara-linux-ti-staging" -PREFERRED_VERSION_sitara-linux-ti-staging = "3.14%" - -# To create newlines in the message \n is used and the slash must be escaped -# to function properly - -SRCIPK_GIT_COMMIT_MESSAGE = "\ -Create local branch\\n\ -\\n\ -The below commit is used for this local branch and is the one used by\\n\ -this sdk:\\n\ -${SRCREV}." - -SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE ="${SRCIPK_GIT_COMMIT_MESSAGE}\\n\\n\ -To reduce the size of the SDK installer only a portion of the git commit\\n\ -history has been preserved. Also links to remote branches and tags do\\n\ -not exist in this copy of the repository.\\n\ -To fix this please run the unshallow-repositories.sh\\n\ -script located in the sdk\'s bin directory\\n\ -\\n\ -The script may take several minutes but you will then have a full copy of\\n\ -the git repository including its entire git history.\\n" - -SRCIPK_CUSTOM_GIT_BRANCH:pn-sitara-linux-ti-staging = "amsdk-8.0" -SRCIPK_CUSTOM_GIT_MESSAGE:pn-sitara-linux-ti-staging = "${SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE}" - -SRCIPK_CUSTOM_GIT_BRANCH:pn-u-boot-ti-staging = "amsdk-8.0" -SRCIPK_CUSTOM_GIT_MESSAGE:pn-u-boot-ti-staging = "${SRCIPK_GIT_COMMIT_MESSAGE}" diff --git a/meta-arago-distro/conf/distro/include/branding-glsdk.inc b/meta-arago-distro/conf/distro/include/branding-glsdk.inc deleted file mode 100644 index 0abd73cc..00000000 --- a/meta-arago-distro/conf/distro/include/branding-glsdk.inc +++ /dev/null @@ -1,11 +0,0 @@ -# GLSDK branding configuration - -# Use the SDK supported kernel and kernel version -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-glsdk" - -PREFERRED_PROVIDER_virtual/bootloader:omap-a15 = "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot:omap-a15 = "u-boot-ti-staging" - -# Set the PREFERRED_VERSION of libdrm to the glsdk version for the -# glsdk branded builds -PREFERRED_VERSION_libdrm = "2.4.41" diff --git a/meta-arago-distro/conf/distro/include/branding-mcsdk.inc b/meta-arago-distro/conf/distro/include/branding-mcsdk.inc deleted file mode 100644 index 7dbffd3a..00000000 --- a/meta-arago-distro/conf/distro/include/branding-mcsdk.inc +++ /dev/null @@ -1,18 +0,0 @@ -# MCSDK branding configuration - -# Use the MCSDK supported versions -PREFERRED_VERSION_libnl = "3.2.24" - -DISTRO_FEATURES += "x11" - -# Java preferences. -PREFERRED_VERSION_icedtea7-native = "2.1.3" -PREFERRED_PROVIDER_openjdk-7-jre = "openjdk-7-jre" - -PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" - -PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" -PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" - -PREFERRED_PROVIDER_jpeg-native = "jpeg-native" -PREFERRED_PROVIDER_glibc-gconv-iso8859-1 = "glibc-locale"
These have not been used nor updated in a long time. They point to old and/or non-existent versions of packages. Drop them. Signed-off-by: Andrew Davis <afd@ti.com> --- .../conf/distro/include/branding-amsdk.inc | 31 ------------------- .../conf/distro/include/branding-glsdk.inc | 11 ------- .../conf/distro/include/branding-mcsdk.inc | 18 ----------- 3 files changed, 60 deletions(-) delete mode 100644 meta-arago-distro/conf/distro/include/branding-amsdk.inc delete mode 100644 meta-arago-distro/conf/distro/include/branding-glsdk.inc delete mode 100644 meta-arago-distro/conf/distro/include/branding-mcsdk.inc