* [DistroKit] [PATCH] scripts: remove obsolete backport
@ 2020-03-27 8:00 Michael Olbrich
2020-03-27 9:15 ` Robert Schwebel
0 siblings, 1 reply; 5+ messages in thread
From: Michael Olbrich @ 2020-03-27 8:00 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
This was fixed a long time ago.
Signed-off-by: Michael Olbrich <m.olbrich@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.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [DistroKit] [PATCH] scripts: remove obsolete backport
2020-03-27 8:00 [DistroKit] [PATCH] scripts: remove obsolete backport Michael Olbrich
@ 2020-03-27 9:15 ` Robert Schwebel
2020-03-27 9:19 ` Michael Olbrich
0 siblings, 1 reply; 5+ messages in thread
From: Robert Schwebel @ 2020-03-27 9:15 UTC (permalink / raw)
To: Michael Olbrich; +Cc: distrokit
On Fri, Mar 27, 2020 at 09:00:57AM +0100, Michael Olbrich wrote:
> This was fixed a long time ago.
>
> Signed-off-by: Michael Olbrich <m.olbrich@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
Hmm? There is no scripts/lib in DistroKit...?
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [DistroKit] [PATCH] scripts: remove obsolete backport
2020-03-27 9:15 ` Robert Schwebel
@ 2020-03-27 9:19 ` Michael Olbrich
2020-03-27 9:24 ` Robert Schwebel
0 siblings, 1 reply; 5+ messages in thread
From: Michael Olbrich @ 2020-03-27 9:19 UTC (permalink / raw)
To: distrokit
On Fri, Mar 27, 2020 at 10:15:18AM +0100, Robert Schwebel wrote:
> On Fri, Mar 27, 2020 at 09:00:57AM +0100, Michael Olbrich wrote:
> > This was fixed a long time ago.
> >
> > Signed-off-by: Michael Olbrich <m.olbrich@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
>
> Hmm? There is no scripts/lib in DistroKit...?
That was a backport from ptxdist. As far as I can tell it's still there:
https://git.pengutronix.de/cgit/DistroKit/tree/scripts/lib/ptxd_make_xpkg_pkg.sh
Michael
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [DistroKit] [PATCH] scripts: remove obsolete backport
2020-03-27 9:19 ` Michael Olbrich
@ 2020-03-27 9:24 ` Robert Schwebel
2020-03-27 9:39 ` Michael Olbrich
0 siblings, 1 reply; 5+ messages in thread
From: Robert Schwebel @ 2020-03-27 9:24 UTC (permalink / raw)
To: distrokit
On Fri, Mar 27, 2020 at 10:19:13AM +0100, Michael Olbrich wrote:
> On Fri, Mar 27, 2020 at 10:15:18AM +0100, Robert Schwebel wrote:
> > On Fri, Mar 27, 2020 at 09:00:57AM +0100, Michael Olbrich wrote:
> > > This was fixed a long time ago.
> > >
> > > Signed-off-by: Michael Olbrich <m.olbrich@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
> >
> > Hmm? There is no scripts/lib in DistroKit...?
>
> That was a backport from ptxdist. As far as I can tell it's still there:
>
> https://git.pengutronix.de/cgit/DistroKit/tree/scripts/lib/ptxd_make_xpkg_pkg.sh
Ah, yes, it is still in master, but was already removed in next.
https://git.pengutronix.de/cgit/DistroKit/commit/?h=next&id=a4ecbe5d42a8b16d35b305ccb8b8a4463c47dc71
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [DistroKit] [PATCH] scripts: remove obsolete backport
2020-03-27 9:24 ` Robert Schwebel
@ 2020-03-27 9:39 ` Michael Olbrich
0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2020-03-27 9:39 UTC (permalink / raw)
To: distrokit
On Fri, Mar 27, 2020 at 10:24:46AM +0100, Robert Schwebel wrote:
> On Fri, Mar 27, 2020 at 10:19:13AM +0100, Michael Olbrich wrote:
> > On Fri, Mar 27, 2020 at 10:15:18AM +0100, Robert Schwebel wrote:
> > > On Fri, Mar 27, 2020 at 09:00:57AM +0100, Michael Olbrich wrote:
> > > > This was fixed a long time ago.
> > > >
> > > > Signed-off-by: Michael Olbrich <m.olbrich@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
> > >
> > > Hmm? There is no scripts/lib in DistroKit...?
> >
> > That was a backport from ptxdist. As far as I can tell it's still there:
> >
> > https://git.pengutronix.de/cgit/DistroKit/tree/scripts/lib/ptxd_make_xpkg_pkg.sh
>
> Ah, yes, it is still in master, but was already removed in next.
> https://git.pengutronix.de/cgit/DistroKit/commit/?h=next&id=a4ecbe5d42a8b16d35b305ccb8b8a4463c47dc71
Ah, right, I missed that one, sorry.
Michael
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-03-27 9:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-27 8:00 [DistroKit] [PATCH] scripts: remove obsolete backport Michael Olbrich
2020-03-27 9:15 ` Robert Schwebel
2020-03-27 9:19 ` Michael Olbrich
2020-03-27 9:24 ` Robert Schwebel
2020-03-27 9:39 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox