[4/4] Makefile: Drop obsolete edison/denzil branch conditionals

Submitted by Richard Purdie on June 17, 2020, 3:44 p.m. | Patch ID: 173662

Details

Message ID 20200617154422.417466-4-richard.purdie@linuxfoundation.org
State New
Headers show

Commit Message

Richard Purdie June 17, 2020, 3:44 p.m.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/Makefile | 54 ------------------------------------------
 1 file changed, 54 deletions(-)

Patch hide | download patch | download mbox

diff --git a/documentation/Makefile b/documentation/Makefile
index 6a369637f..7d4058ae7 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -140,32 +140,10 @@  ALLPREQ = html tarball
 # This would be appropriate for "master" branch.
 #
 
-	ifeq ($(BRANCH),edison)
-TARFILES = dev-style.css dev-manual.html \
-           figures/app-dev-flow.png figures/bsp-dev-flow.png \
-           figures/dev-title.png figures/git-workflow.png \
-           figures/index-downloads.png figures/kernel-dev-flow.png \
-           figures/kernel-example-repos-edison.png \
-           figures/kernel-overview-1.png figures/kernel-overview-2.png \
-           figures/kernel-overview-3-edison.png \
-           figures/source-repos.png figures/yp-download.png \
-           figures/wip.png
-	else ifeq ($(BRANCH),denzil)
-TARFILES = dev-style.css dev-manual.html \
-           figures/app-dev-flow.png figures/bsp-dev-flow.png \
-           figures/dev-title.png figures/git-workflow.png \
-           figures/index-downloads.png figures/kernel-dev-flow.png \
-           figures/kernel-example-repos-denzil.png \
-           figures/kernel-overview-1.png figures/kernel-overview-2.png \
-           figures/kernel-overview-3-denzil.png \
-           figures/source-repos.png figures/yp-download.png \
-           figures/wip.png
-        else
 TARFILES = dev-style.css dev-manual.html figures/buildhistory-web.png \
            figures/dev-title.png figures/buildhistory.png \
            figures/recipe-workflow.png figures/bitbake-build-flow.png \
            figures/multiconfig_files.png figures/cute-files-npm-example.png
-	endif
 
 MANUALS = $(DOC)/$(DOC).html
 FIGURES = figures
@@ -181,37 +159,6 @@  XSLTOPTS = --stringparam html.stylesheet mega-style.css \
            --xinclude
 ALLPREQ = html tarball
 
-	ifeq ($(BRANCH),edison)
-TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png \
-        figures/building-an-image.png  \
-	figures/using-a-pre-built-image.png \
-	figures/poky-title.png \
-	figures/adt-title.png figures/bsp-title.png \
-	figures/kernel-title.png figures/kernel-architecture-overview.png \
-	figures/app-dev-flow.png figures/bsp-dev-flow.png \
-        figures/dev-title.png figures/git-workflow.png \
-        figures/index-downloads.png figures/kernel-dev-flow.png \
-	figures/kernel-example-repos-edison.png \
-	figures/kernel-overview-1.png figures/kernel-overview-2.png \
-	figures/kernel-overview-3-edison.png \
-	figures/source-repos.png figures/yp-download.png \
-	figures/wip.png
-	else ifeq ($(BRANCH),denzil)
-TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png \
-        figures/building-an-image.png  \
-	figures/using-a-pre-built-image.png \
-	figures/poky-title.png \
-	figures/adt-title.png figures/bsp-title.png \
-	figures/kernel-title.png figures/kernel-architecture-overview.png \
-	figures/app-dev-flow.png figures/bsp-dev-flow.png \
-        figures/dev-title.png figures/git-workflow.png \
-        figures/index-downloads.png figures/kernel-dev-flow.png \
-	figures/kernel-example-repos-denzil.png \
-	figures/kernel-overview-1.png figures/kernel-overview-2.png \
-	figures/kernel-overview-3-denzil.png \
-	figures/source-repos.png figures/yp-download.png \
-	figures/wip.png
-        else
 TARFILES = mega-manual.html mega-style.css \
         figures/YP-flow-diagram.png \
 	figures/using-a-pre-built-image.png \
@@ -269,7 +216,6 @@  TARFILES = mega-manual.html mega-style.css \
 	figures/sdk-devtool-upgrade-flow.png figures/bitbake-build-flow.png figures/bypqs-title.png \
 	figures/overview-manual-title.png figures/sdk-autotools-flow.png figures/sdk-makefile-flow.png \
 	figures/bb_multiconfig_files.png figures/bitbake-title.png figures/cute-files-npm-example.png
-	endif
 
 MANUALS = $(DOC)/$(DOC).html
 FIGURES = figures

Comments

Armin Kuster June 17, 2020, 5:09 p.m.
hmm, I am sure I sent a patch to do this a while back, was there a problem ?

https://lists.yoctoproject.org/g/docs/message/162

-aarmin

On 6/17/20 8:44 AM, Richard Purdie wrote:
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  documentation/Makefile | 54 ------------------------------------------
>  1 file changed, 54 deletions(-)
>
> diff --git a/documentation/Makefile b/documentation/Makefile
> index 6a369637f..7d4058ae7 100644
> --- a/documentation/Makefile
> +++ b/documentation/Makefile
> @@ -140,32 +140,10 @@ ALLPREQ = html tarball
>  # This would be appropriate for "master" branch.
>  #
>  
> -	ifeq ($(BRANCH),edison)
> -TARFILES = dev-style.css dev-manual.html \
> -           figures/app-dev-flow.png figures/bsp-dev-flow.png \
> -           figures/dev-title.png figures/git-workflow.png \
> -           figures/index-downloads.png figures/kernel-dev-flow.png \
> -           figures/kernel-example-repos-edison.png \
> -           figures/kernel-overview-1.png figures/kernel-overview-2.png \
> -           figures/kernel-overview-3-edison.png \
> -           figures/source-repos.png figures/yp-download.png \
> -           figures/wip.png
> -	else ifeq ($(BRANCH),denzil)
> -TARFILES = dev-style.css dev-manual.html \
> -           figures/app-dev-flow.png figures/bsp-dev-flow.png \
> -           figures/dev-title.png figures/git-workflow.png \
> -           figures/index-downloads.png figures/kernel-dev-flow.png \
> -           figures/kernel-example-repos-denzil.png \
> -           figures/kernel-overview-1.png figures/kernel-overview-2.png \
> -           figures/kernel-overview-3-denzil.png \
> -           figures/source-repos.png figures/yp-download.png \
> -           figures/wip.png
> -        else
>  TARFILES = dev-style.css dev-manual.html figures/buildhistory-web.png \
>             figures/dev-title.png figures/buildhistory.png \
>             figures/recipe-workflow.png figures/bitbake-build-flow.png \
>             figures/multiconfig_files.png figures/cute-files-npm-example.png
> -	endif
>  
>  MANUALS = $(DOC)/$(DOC).html
>  FIGURES = figures
> @@ -181,37 +159,6 @@ XSLTOPTS = --stringparam html.stylesheet mega-style.css \
>             --xinclude
>  ALLPREQ = html tarball
>  
> -	ifeq ($(BRANCH),edison)
> -TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png \
> -        figures/building-an-image.png  \
> -	figures/using-a-pre-built-image.png \
> -	figures/poky-title.png \
> -	figures/adt-title.png figures/bsp-title.png \
> -	figures/kernel-title.png figures/kernel-architecture-overview.png \
> -	figures/app-dev-flow.png figures/bsp-dev-flow.png \
> -        figures/dev-title.png figures/git-workflow.png \
> -        figures/index-downloads.png figures/kernel-dev-flow.png \
> -	figures/kernel-example-repos-edison.png \
> -	figures/kernel-overview-1.png figures/kernel-overview-2.png \
> -	figures/kernel-overview-3-edison.png \
> -	figures/source-repos.png figures/yp-download.png \
> -	figures/wip.png
> -	else ifeq ($(BRANCH),denzil)
> -TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png \
> -        figures/building-an-image.png  \
> -	figures/using-a-pre-built-image.png \
> -	figures/poky-title.png \
> -	figures/adt-title.png figures/bsp-title.png \
> -	figures/kernel-title.png figures/kernel-architecture-overview.png \
> -	figures/app-dev-flow.png figures/bsp-dev-flow.png \
> -        figures/dev-title.png figures/git-workflow.png \
> -        figures/index-downloads.png figures/kernel-dev-flow.png \
> -	figures/kernel-example-repos-denzil.png \
> -	figures/kernel-overview-1.png figures/kernel-overview-2.png \
> -	figures/kernel-overview-3-denzil.png \
> -	figures/source-repos.png figures/yp-download.png \
> -	figures/wip.png
> -        else
>  TARFILES = mega-manual.html mega-style.css \
>          figures/YP-flow-diagram.png \
>  	figures/using-a-pre-built-image.png \
> @@ -269,7 +216,6 @@ TARFILES = mega-manual.html mega-style.css \
>  	figures/sdk-devtool-upgrade-flow.png figures/bitbake-build-flow.png figures/bypqs-title.png \
>  	figures/overview-manual-title.png figures/sdk-autotools-flow.png figures/sdk-makefile-flow.png \
>  	figures/bb_multiconfig_files.png figures/bitbake-title.png figures/cute-files-npm-example.png
> -	endif
>  
>  MANUALS = $(DOC)/$(DOC).html
>  FIGURES = figures
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#277): https://lists.yoctoproject.org/g/docs/message/277
Mute This Topic: https://lists.yoctoproject.org/mt/74940129/3617530
Group Owner: docs+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/docs/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Richard Purdie June 17, 2020, 5:25 p.m.
On Wed, 2020-06-17 at 10:09 -0700, akuster808 wrote:
> hmm, I am sure I sent a patch to do this a while back, was there a
> problem ?
> 
> https://lists.yoctoproject.org/g/docs/message/162

Sorry, I thought there was one but couldn't find it :/. I think it was
sent when we were coming to the end of the release and we agreed it was
not the right time.

Cheers,

Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#278): https://lists.yoctoproject.org/g/docs/message/278
Mute This Topic: https://lists.yoctoproject.org/mt/74940129/3617530
Group Owner: docs+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/docs/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-