[DistroKit] [PATCH 1/2] ptxd_install_replace_figlet: remove redundant backport

[DistroKit] [PATCH 1/2] ptxd_install_replace_figlet: remove redundant backport

[Roland Hieber]

The fix went upstream in PTXdist 2018.10.0 with commit 43bd490bdfd1
("ptxd_install_replace_figlet: replace all backslashes, not only the
first"), so our backport is no longer necessary, and also has no
relevant diff to the upstream version.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 scripts/lib/ptxd_make_xpkg_pkg.sh | 57 -------------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 scripts/lib/ptxd_make_xpkg_pkg.sh

diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh
deleted file mode 100644
index b75690ba5ed7..000000000000
--- a/scripts/lib/ptxd_make_xpkg_pkg.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# workaround for ptxdist-2018.10.0: override this function to the old
-# variant from ptxdist-2018.09.0, as it is currently broken.
-#
-
-export -fn ptxd_install_replace_figlet
-
-ptxd_install_replace_figlet() {
-    local dst="$1"
-    local placeholder="$2"
-    local value="$3"
-    local escapemode="$4"
-    local -a dirs ndirs pdirs sdirs ddirs
-    local mod_nfs mod_rw
-
-    ptxd_install_setup &&
-    echo "\
-install replace figlet:
-  file=${dst}
-  '${placeholder}' -> '\`figlet ${value}\`'
-" &&
-
-    ptxd_exist "${dirs[@]/%/${dst}}" &&
-    ptxd_figlet_helper() {
-        local value="$1"
-        local escapemode="$2"
-        figlet -d "${PTXDIST_SYSROOT_HOST}/share/figlet" -- "${value}" | \
-        case "$escapemode" in
-            # /etc/issue needs each backslash quoted by another backslash. As
-            # the string is interpreted by the shell once more below, another
-            # level of quoting is needed such that every \ in the output of
-            # figlet needs to be replaced by \\\\. As a \ in sed needs to be
-            # quoted, too, this results in eight backslashes in the replacement
-            # string.
-            etcissue)	sed 's,\\,\\\\\\\\,g';;
-            *)		;;
-        esac | \
-        awk '{ if ($0 !~ "^ *$") printf("%s\\n", $0) }'  # newlines for sed
-    } &&
-    figlet="$(ptxd_figlet_helper "$value" "$escapemode")" &&
-    sed -i -e "s#${placeholder}#${figlet}#g" "${dirs[@]/%/${dst}}" ||
-
-    ptxd_install_error "install_replace failed!"
-}
-
-export -f ptxd_install_replace_figlet
-
-- 
2.25.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 2/2] remove more references to nonexisting CREDITS file

[Roland Hieber]

Fixes: 3dd5c0fe34cee8ebbcdd ("rules: remove CREDIT lines")
Fixes: 3bce747e47170b219334 ("v7a: add stm32mp157c-dk2 SD-Card image")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-v7a/rules/barebox-stm32mp.make       | 2 --
 configs/platform-v7a/rules/image-stm32mp157c-dk2.make | 2 --
 configs/platform-v7a/scripts/lib/ptxd_make_nfsd.sh    | 2 --
 3 files changed, 6 deletions(-)

diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make
index 962409696483..35e3edcdd833 100644
--- a/configs/platform-v7a/rules/barebox-stm32mp.make
+++ b/configs/platform-v7a/rules/barebox-stm32mp.make
@@ -2,8 +2,6 @@
 #
 # Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
 #
-# See CREDITS for details about who has contributed to this project.
-#
 # For further information about the PTXdist project and license conditions
 # see the README file.
 #
diff --git a/configs/platform-v7a/rules/image-stm32mp157c-dk2.make b/configs/platform-v7a/rules/image-stm32mp157c-dk2.make
index d5e524646a50..864c899511c3 100644
--- a/configs/platform-v7a/rules/image-stm32mp157c-dk2.make
+++ b/configs/platform-v7a/rules/image-stm32mp157c-dk2.make
@@ -2,8 +2,6 @@
 #
 # Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
 #
-# See CREDITS for details about who has contributed to this project.
-#
 # For further information about the PTXdist project and license conditions
 # see the README file.
 #
diff --git a/configs/platform-v7a/scripts/lib/ptxd_make_nfsd.sh b/configs/platform-v7a/scripts/lib/ptxd_make_nfsd.sh
index 2fefcdce77b4..00fb2e8222e0 100644
--- a/configs/platform-v7a/scripts/lib/ptxd_make_nfsd.sh
+++ b/configs/platform-v7a/scripts/lib/ptxd_make_nfsd.sh
@@ -2,8 +2,6 @@
 #
 # Copyright (C) 2012 by Michael Olbrich <m.olbrich@pengutronix.de>
 #
-# See CREDITS for details about who has contributed to this project.
-#
 # For further information about the PTXdist project and license conditions
 # see the README file.
 #
-- 
2.25.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

Re: [DistroKit] [PATCH 1/2] ptxd_install_replace_figlet: remove redundant backport

[Robert Schwebel]

On Mon, Mar 09, 2020 at 12:08:02PM +0100, Roland Hieber wrote:
> The fix went upstream in PTXdist 2018.10.0 with commit 43bd490bdfd1
> ("ptxd_install_replace_figlet: replace all backslashes, not only the
> first"), so our backport is no longer necessary, and also has no
> relevant diff to the upstream version.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  scripts/lib/ptxd_make_xpkg_pkg.sh | 57 -------------------------------
>  1 file changed, 57 deletions(-)
>  delete mode 100644 scripts/lib/ptxd_make_xpkg_pkg.sh

Applied to next.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

Re: [DistroKit] [PATCH 2/2] remove more references to nonexisting CREDITS file

[Robert Schwebel]

On Mon, Mar 09, 2020 at 12:08:03PM +0100, Roland Hieber wrote:
> Fixes: 3dd5c0fe34cee8ebbcdd ("rules: remove CREDIT lines")
> Fixes: 3bce747e47170b219334 ("v7a: add stm32mp157c-dk2 SD-Card image")
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/platform-v7a/rules/barebox-stm32mp.make       | 2 --
>  configs/platform-v7a/rules/image-stm32mp157c-dk2.make | 2 --
>  configs/platform-v7a/scripts/lib/ptxd_make_nfsd.sh    | 2 --
>  3 files changed, 6 deletions(-)

Applied to next.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de