[ptxdist] [PATCH] [mgetty] bump to 1.1.36, fix config file path
Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de
---
rules/mgetty.in |2 +-
rules/mgetty.make | 15 ---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/rules/mgetty.in b/rules/mgetty.in
index 03f85b9..363e6a2 100644
--- a/rules/mgetty.in
+++ b/rules/mgetty.in
@@ -20,7 +20,7 @@ if MGETTY
config MGETTY_CONFIG
prompt Name of policy.h file to be used
string
- default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-1.1.30/policy.h-dist
+ default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-1.1.36/policy.h-dist
help
FIXME: This item needs to be documented
diff --git a/rules/mgetty.make b/rules/mgetty.make
index c77e745..86f0259 100644
--- a/rules/mgetty.make
+++ b/rules/mgetty.make
@@ -17,12 +17,11 @@ PACKAGES-$(PTXCONF_MGETTY) += mgetty
#
# Paths and names
#
-MGETTY_VERSION = 1.1.30
-MGETTY_DATE= Dec16
-MGETTY = mgetty$(MGETTY_VERSION)
-MGETTY_SUFFIX = tar.gz
-MGETTY_URL =
ftp://alpha.greenie.net/pub/mgetty/source/1.1/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
-MGETTY_SOURCE = $(SRCDIR)/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
+MGETTY_VERSION = 1.1.36
+MGETTY = mgetty_$(MGETTY_VERSION)
+MGETTY_SUFFIX = orig.tar.gz
+MGETTY_URL =
ftp://ftp.de.debian.org/debian/pool/main/m/mgetty/$(MGETTY).$(MGETTY_SUFFIX)
+MGETTY_SOURCE = $(SRCDIR)/$(MGETTY).$(MGETTY_SUFFIX)
MGETTY_DIR = $(BUILDDIR)/mgetty-$(MGETTY_VERSION)
@@ -72,7 +71,9 @@ $(STATEDIR)/mgetty.prepare: $(mgetty_prepare_deps_default)
sed -i -e s,^CC.*=.*,,g $$file; \
sed -i -e s,^LDFLAGS.*=.*,,g $$file; \
sed -i -e s,^LIBS.*=.*,,g $$file; \
- sed -i -e s,^prefix.*=.*,prefix=$(SYSROOT),g $$file; \
+ sed -i -e s,^prefix.*=.*,prefix=/usr,g $$file; \
+ sed -i -e s,^CONFDIR.*=.*,CONFDIR=/etc/mgetty+sendfax,g
$$file; \
+ echo $$file; \
done
@$(call touch, $@)
--
1.5.4.3
Amtsgericht Ingolstadt - GmbH: HRB 191328 - KG: HRA 170363
Geschäftsführer: Dr.-Ing. Michael Sorg, Dipl.-Ing. Franz Sorg
USt-IdNr.: DE 128592548
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [mgetty] bump to 1.1.36, fix config file path
Josef Holzmayr wrote:
Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de
---
rules/mgetty.in |2 +-
rules/mgetty.make | 15 ---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/rules/mgetty.in b/rules/mgetty.in
index 03f85b9..363e6a2 100644
--- a/rules/mgetty.in
+++ b/rules/mgetty.in
@@ -20,7 +20,7 @@ if MGETTY
config MGETTY_CONFIG
prompt Name of policy.h file to be used
string
- default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-1.1.30/policy.h-dist
+ default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-1.1.36/policy.h-dist
please use $(PTXCONF_MGETTY_VERSION)
help
FIXME: This item needs to be documented
diff --git a/rules/mgetty.make b/rules/mgetty.make
index c77e745..86f0259 100644
--- a/rules/mgetty.make
+++ b/rules/mgetty.make
@@ -17,12 +17,11 @@ PACKAGES-$(PTXCONF_MGETTY) += mgetty
#
# Paths and names
#
-MGETTY_VERSION = 1.1.30
-MGETTY_DATE = Dec16
-MGETTY = mgetty$(MGETTY_VERSION)
-MGETTY_SUFFIX= tar.gz
-MGETTY_URL =
ftp://alpha.greenie.net/pub/mgetty/source/1.1/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
-MGETTY_SOURCE= $(SRCDIR)/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
+MGETTY_VERSION = 1.1.36
+MGETTY = mgetty_$(MGETTY_VERSION)
+MGETTY_SUFFIX= orig.tar.gz
+MGETTY_URL =
ftp://ftp.de.debian.org/debian/pool/main/m/mgetty/$(MGETTY).$(MGETTY_SUFFIX)
+MGETTY_SOURCE= $(SRCDIR)/$(MGETTY).$(MGETTY_SUFFIX)
MGETTY_DIR = $(BUILDDIR)/mgetty-$(MGETTY_VERSION)
please use := instead of just =
@@ -72,7 +71,9 @@ $(STATEDIR)/mgetty.prepare: $(mgetty_prepare_deps_default)
sed -i -e s,^CC.*=.*,,g $$file; \
sed -i -e s,^LDFLAGS.*=.*,,g $$file; \
sed -i -e s,^LIBS.*=.*,,g $$file; \
- sed -i -e s,^prefix.*=.*,prefix=$(SYSROOT),g $$file; \
+ sed -i -e s,^prefix.*=.*,prefix=/usr,g $$file; \
+ sed -i -e s,^CONFDIR.*=.*,CONFDIR=/etc/mgetty+sendfax,g
$$file; \
Can you please make a patch from these seds?
+ echo $$file;
done
@$(call touch, $@)
cheers, Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Linux Solutions for Science and Industry | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [mgetty] import debian patches for mgetty 1.1.36, taken from:
Josef Holzmayr wrote: Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de --- patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff | 6097 ++ patches/mgetty_1.1.36/series |1 + 2 files changed, 6098 insertions(+), 0 deletions(-) create mode 100644 patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff create mode 100644 patches/mgetty_1.1.36/series diff --git a/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff b/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff new file mode 100644 index 000..4fb7a35 --- /dev/null +++ b/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff can you please add the canonical patch header to that diff file. @@ -0,0 +1,6097 @@ +--- mgetty-1.1.36.orig/logfile.c mgetty-1.1.36/logfile.c cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] [mgetty] fix directories for install and config files
Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de --- rules/mgetty.make |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/rules/mgetty.make b/rules/mgetty.make index c77e745..1535875 100644 --- a/rules/mgetty.make +++ b/rules/mgetty.make @@ -72,7 +72,8 @@ $(STATEDIR)/mgetty.prepare: $(mgetty_prepare_deps_default) sed -i -e s,^CC.*=.*,,g $$file; \ sed -i -e s,^LDFLAGS.*=.*,,g $$file; \ sed -i -e s,^LIBS.*=.*,,g $$file; \ - sed -i -e s,^prefix.*=.*,prefix=$(SYSROOT),g $$file; \ + sed -i -e s,^prefix.*=.*,prefix=/usr,g $$file; \ + sed -i -e s,^CONFDIR.*=.*,CONFDIR=/etc/mgetty+sendfax,g $$file; \ done @$(call touch, $@) -- 1.5.4.3 Amtsgericht Ingolstadt - GmbH: HRB 191328 - KG: HRA 170363 Geschäftsführer: Dr.-Ing. Michael Sorg, Dipl.-Ing. Franz Sorg USt-IdNr.: DE 128592548 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] [mgetty] bump version to 1.1.36
Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de
---
rules/mgetty.in |2 +-
rules/mgetty.make | 14 ++
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/rules/mgetty.in b/rules/mgetty.in
index 03f85b9..c7896a4 100644
--- a/rules/mgetty.in
+++ b/rules/mgetty.in
@@ -20,7 +20,7 @@ if MGETTY
config MGETTY_CONFIG
prompt Name of policy.h file to be used
string
- default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-1.1.30/policy.h-dist
+ default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-${PTXCONF_MGETTY_VERSION}/policy.h-dist
help
FIXME: This item needs to be documented
diff --git a/rules/mgetty.make b/rules/mgetty.make
index c77e745..908190f 100644
--- a/rules/mgetty.make
+++ b/rules/mgetty.make
@@ -17,14 +17,12 @@ PACKAGES-$(PTXCONF_MGETTY) += mgetty
#
# Paths and names
#
-MGETTY_VERSION = 1.1.30
-MGETTY_DATE= Dec16
-MGETTY = mgetty$(MGETTY_VERSION)
-MGETTY_SUFFIX = tar.gz
-MGETTY_URL =
ftp://alpha.greenie.net/pub/mgetty/source/1.1/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
-MGETTY_SOURCE = $(SRCDIR)/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
-MGETTY_DIR = $(BUILDDIR)/mgetty-$(MGETTY_VERSION)
-
+MGETTY_VERSION := 1.1.36
+MGETTY := mgetty_$(MGETTY_VERSION)
+MGETTY_SUFFIX := orig.tar.gz
+MGETTY_URL :=
ftp://ftp.de.debian.org/debian/pool/main/m/mgetty/$(MGETTY).$(MGETTY_SUFFIX)
+MGETTY_SOURCE := $(SRCDIR)/$(MGETTY).$(MGETTY_SUFFIX)
+MGETTY_DIR := $(BUILDDIR)/mgetty-$(MGETTY_VERSION)
#
# Get
--
1.5.4.3
Amtsgericht Ingolstadt - GmbH: HRB 191328 - KG: HRA 170363
Geschäftsführer: Dr.-Ing. Michael Sorg, Dipl.-Ing. Franz Sorg
USt-IdNr.: DE 128592548
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [mgetty] bump version to 1.1.36
Josef Holzmayr wrote:
Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de
---
rules/mgetty.in |2 +-
rules/mgetty.make | 14 ++
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/rules/mgetty.in b/rules/mgetty.in
index 03f85b9..c7896a4 100644
--- a/rules/mgetty.in
+++ b/rules/mgetty.in
@@ -20,7 +20,7 @@ if MGETTY
config MGETTY_CONFIG
prompt Name of policy.h file to be used
string
- default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-1.1.30/policy.h-dist
+ default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-${PTXCONF_MGETTY_VERSION}/policy.h-dist
help
FIXME: This item needs to be documented
diff --git a/rules/mgetty.make b/rules/mgetty.make
index c77e745..908190f 100644
--- a/rules/mgetty.make
+++ b/rules/mgetty.make
@@ -17,14 +17,12 @@ PACKAGES-$(PTXCONF_MGETTY) += mgetty
#
# Paths and names
#
-MGETTY_VERSION = 1.1.30
-MGETTY_DATE = Dec16
-MGETTY = mgetty$(MGETTY_VERSION)
-MGETTY_SUFFIX= tar.gz
-MGETTY_URL =
ftp://alpha.greenie.net/pub/mgetty/source/1.1/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
-MGETTY_SOURCE= $(SRCDIR)/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
-MGETTY_DIR = $(BUILDDIR)/mgetty-$(MGETTY_VERSION)
-
+MGETTY_VERSION := 1.1.36
+MGETTY := mgetty_$(MGETTY_VERSION)
+MGETTY_SUFFIX:= orig.tar.gz
+MGETTY_URL :=
ftp://ftp.de.debian.org/debian/pool/main/m/mgetty/$(MGETTY).$(MGETTY_SUFFIX)
please use $(PTXCONF_SETUP_DEBMIRROR)/pool/
+MGETTY_SOURCE:= $(SRCDIR)/$(MGETTY).$(MGETTY_SUFFIX)
+MGETTY_DIR := $(BUILDDIR)/mgetty-$(MGETTY_VERSION)
#
# Get
otherwise it looks good.
cheers, Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Linux Solutions for Science and Industry | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [mgetty] import patches from Debian
Josef Holzmayr wrote: Taken from: http://ftp.de.debian.org/debian/pool/main/m/mgetty/mgetty_1.1.36-1.5.diff.gz Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de --- patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff | 6105 ++ patches/mgetty_1.1.36/series |1 + 2 files changed, 6106 insertions(+), 0 deletions(-) create mode 100644 patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff create mode 100644 patches/mgetty_1.1.36/series diff --git a/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff b/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff new file mode 100644 index 000..04b8c95 --- /dev/null +++ b/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff @@ -0,0 +1,6105 @@ +Subject: [mgetty] various patches, taken from Debian +From: Josef Holzmayr holzm...@rsi-elektrotechnik.de + +These are the patches to mgetty as used by Debian. an URL pointing to the patches would be fine. + +Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/3] [mgetty] bump version to 1.1.36
Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de
---
rules/mgetty.in |2 +-
rules/mgetty.make | 14 ++
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/rules/mgetty.in b/rules/mgetty.in
index 03f85b9..c7896a4 100644
--- a/rules/mgetty.in
+++ b/rules/mgetty.in
@@ -20,7 +20,7 @@ if MGETTY
config MGETTY_CONFIG
prompt Name of policy.h file to be used
string
- default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-1.1.30/policy.h-dist
+ default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-${PTXCONF_MGETTY_VERSION}/policy.h-dist
help
FIXME: This item needs to be documented
diff --git a/rules/mgetty.make b/rules/mgetty.make
index c77e745..421d5b0 100644
--- a/rules/mgetty.make
+++ b/rules/mgetty.make
@@ -17,14 +17,12 @@ PACKAGES-$(PTXCONF_MGETTY) += mgetty
#
# Paths and names
#
-MGETTY_VERSION = 1.1.30
-MGETTY_DATE= Dec16
-MGETTY = mgetty$(MGETTY_VERSION)
-MGETTY_SUFFIX = tar.gz
-MGETTY_URL =
ftp://alpha.greenie.net/pub/mgetty/source/1.1/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
-MGETTY_SOURCE = $(SRCDIR)/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
-MGETTY_DIR = $(BUILDDIR)/mgetty-$(MGETTY_VERSION)
-
+MGETTY_VERSION := 1.1.36
+MGETTY := mgetty_$(MGETTY_VERSION)
+MGETTY_SUFFIX := orig.tar.gz
+MGETTY_URL :=
${PTXCONF_SETUP_DEBMIRROR}/pool/main/m/mgetty/$(MGETTY).$(MGETTY_SUFFIX)
+MGETTY_SOURCE := $(SRCDIR)/$(MGETTY).$(MGETTY_SUFFIX)
+MGETTY_DIR := $(BUILDDIR)/mgetty-$(MGETTY_VERSION)
#
# Get
--
1.6.4.4
Amtsgericht Ingolstadt - GmbH: HRB 191328 - KG: HRA 170363
Geschäftsführer: Dr.-Ing. Michael Sorg, Dipl.-Ing. Franz Sorg
USt-IdNr.: DE 128592548
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] new rules -- sparsehash (corrected line wrapping)
Hello! Will this or some of the other patches ever be added. If not -- why? Wth regards, Markus -- Markus Rathgeb Public Key Server: http://wwwkeys.us.pgp.net/ bzw. hkp://wwwkeys.us.pgp.net/ Public Key Server: http://stinkfoot.org:11371/ bzw. hkp://stinkfoot.org Erst nachdem wir alles verloren haben, haben wir die Freiheit, alles zu tun. It's only after we've lost everything, that we're free to do anything! signature.asc Description: This is a digitally signed message part. -- ptxdist mailing list ptxdist@pengutronix.de
