From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH v2] fixup! imx-uuc: new package
Date: Thu, 2 Apr 2020 08:39:41 +0200 [thread overview]
Message-ID: <20200402063941.GH7599@pengutronix.de> (raw)
In-Reply-To: <ef0d70a1a6610a73dd2d24dae16531509241c082.camel@diehl.com>
On Thu, Apr 02, 2020 at 06:28:30AM +0000, Denis Osterland-Heim wrote:
> Am Mittwoch, den 01.04.2020, 17:08 +0200 schrieb Michael Olbrich:
> > On Tue, Mar 31, 2020 at 05:29:01AM +0000, Denis Osterland-Heim wrote:
> > > NXP user space util used by mfgtool.
> > >
> > > Signed-off-by: Denis Osterland-Heim <Denis.Osterland@diehl.com>
> > > ---
> > > ...001-sh-does-not-support-array-syntax.patch | 117 ++++++++++++++++++
> > > .../series | 4 +
> >
> > Now we have two patches :-/. I'll do another fixup myself.
> I am a little bit confused.
> I thought you would apply just the fixup version.
> It looks like something like: git am; git am; git rebase -i HEAD^^
> What happens at your side?
Your subject says 'fixup!' so I assumed it was a fixup :-). And by that I
mean a patch that should be squashed into your original patch. That worked
beacause rules/imx-uuc.in and rules/imx-uuc.make where identical so git-am
dropped that part and I didn't look any closer...
Please either provide a real fixup or just call it 'v3' the next time.
Anyways, I have the correct thing now and it should hit master soon. I
don't know if you'll get a 'applied' mail from my tooling...
Michael
> > > rules/imx-uuc.in | 7 ++
> > > rules/imx-uuc.make | 60 +++++++++
> > > 4 files changed, 188 insertions(+)
> > > create mode 100644 patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc/0001-sh-does-not-support-array-syntax.patch
> > > create mode 100644 patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc/series
> > > create mode 100644 rules/imx-uuc.in
> > > create mode 100644 rules/imx-uuc.make
> > >
> > > diff --git a/patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc/0001-sh-does-not-support-array-syntax.patch b/patches/imx-uuc-2019-11-07-
> > > gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc/0001-sh-does-not-support-array-syntax.patch
> > > new file mode 100644
> > > index 000000000..995baea19
> > > --- /dev/null
> > > +++ b/patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc/0001-sh-does-not-support-array-syntax.patch
> > > @@ -0,0 +1,117 @@
> > > +From: Denis Osterland-Heim <Denis.Osterland@diehl.com>
> > > +Date: Thu, 12 Mar 2020 17:36:22 +0100
> > > +Subject: [PATCH] sh does not support array syntax
> > > +
> > > +Remove NFS support, because it uses additional arrays and it is not
> > > +tested.
> > > +
> > > +Signed-off-by: Denis Osterland-Heim <Denis.Osterland@diehl.com>
> > > +---
> > > + linuxrc | 72 ++++++-----------------------------------------------------------
> > > + 1 file changed, 6 insertions(+), 66 deletions(-)
> > > +
> > > +diff --git a/linuxrc b/linuxrc
> > > +index 54bb8a2cbbd8..1f15e3cbdff3 100755
> > > +--- a/linuxrc
> > > ++++ b/linuxrc
> > > +@@ -16,20 +16,8 @@ last=0;
> > > +
> > > + UDC_DIR=/sys/class/udc
> > > +
> > > +-function launch_dhcpd() {
> > > +-
> > > +- touch -f /var/lib/misc/udhcpd.leases
> > > +- echo start 168.1.1.50 > /conf
> > > +- echo end 168.1.1.253 >> /conf
> > > +- echo interface usb$1 >>/conf
> > > +-
> > > +- ifconfig usb$1 168.1.1.1
> > > +- udhcpd /conf
> > > +-
> > > +-}
> > > +-
> > > + function contains() {
> > > +- for i in "${files[@]}"
> > > ++ for i in $files
> > > + do
> > > + if [ "$i" == "$1" ]; then
> > > + return 1;
> > > +@@ -45,7 +33,8 @@ function launch_uuc() {
> > > + echo 0x066F > idVendor
> > > +
> > > + if [[ ${cmdline} == *nfsroot* ]]; then
> > > +- echo 0x9CFF > idProduct
> > > ++ echo "unsupported"
> > > ++ exit 1
> > > + else
> > > + echo 0x9BFF > idProduct
> > > + fi
> > > +@@ -69,57 +58,8 @@ function launch_uuc() {
> > > + echo 0x40 > os_desc/b_vendor_code
> > > +
> > > + if [[ ${cmdline} == *nfsroot* ]]; then
> > > +- mkdir functions/ncm.1
> > > +- ln -s functions/ncm.1 configs/c.1/
> > > +-# mkdir functions/acm.1
> > > +-# ln -s functions/acm.1 configs/c.1/
> > > +- echo $1 > UDC
> > > +-
> > > +- echo "Start config network"
> > > +-
> > > +- ifconfig usb$2 up
> > > +- while [ ! -e /find_one ]
> > > +- do
> > > +- if [[ `ifconfig usb$2` == *inet6* ]]; then
> > > +- break;
> > > +- fi
> > > +- sleep 1
> > > +- done
> > > +-
> > > +- if [ -e /find_one ]; then
> > > +- exit 0
> > > +- fi
> > > +-
> > > +- touch /find_one
> > > +-
> > > +- launch_dhcpd $2
> > > +-
> > > +- remote=""
> > > +- while [[ "$remote" == "" ]];
> > > +- do
> > > +- sleep 2
> > > +- echo retry get remote ipaddress
> > > +- ping6 -c2 -I usb$2 ff02::1
> > > +-
> > > +- remote=`ip -6 neighbor show dev usb$2`
> > > +- remote=(${remote})
> > > +- remote=${remote[0]}
> > > +- done
> > > +-
> > > +- nfs=${cmdline#*nfsroot=}
> > > +- nfs=($nfs)
> > > +- nfs=${nfs[0]}
> > > +-
> > > +- nfs=${nfs##*:}
> > > +-
> > > +- echo ${remote} ${nfs}
> > > +-
> > > +- mount -t nfs [${remote}%usb$2]:${nfsroot}/${nfs} /mnt/
> > > +-
> > > +- cd /
> > > +-
> > > +- touch /exit_scan
> > > +-
> > > ++ echo "unsuppored"
> > > ++ exit 1
> > > + else
> > > + mkdir functions/ffs.utp$2
> > > + mkdir /dev/usb-utp$2
> > > +@@ -161,7 +101,7 @@ if test "$(ls -A "$UDC_DIR")"; then
> > > + for entry in *
> > > + do
> > > + if contains $entry; then
> > > +- files[$last]=$entry;
> > > ++ files="$files $entry";
> > > + id=$last;
> > > + last=`expr $last + 1`;
> > > + echo "Found New UDC: $entry";
> > > diff --git a/patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc/series b/patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc/series
> > > new file mode 100644
> > > index 000000000..125c531a3
> > > --- /dev/null
> > > +++ b/patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc/series
> > > @@ -0,0 +1,4 @@
> > > +# generated by git-ptx-patches
> > > +#tag:base --start-number 1
> > > +0001-sh-does-not-support-array-syntax.patch
> > > +# a982c4666a0474a014b361496182bd8c - git-ptx-patches magic
> > > diff --git a/rules/imx-uuc.in b/rules/imx-uuc.in
> > > new file mode 100644
> > > index 000000000..ec0cbcd3a
> > > --- /dev/null
> > > +++ b/rules/imx-uuc.in
> > > @@ -0,0 +1,7 @@
> > > +## SECTION=communication
> > > +
> > > +config IMX_UUC
> > > + tristate
> > > + prompt "imx-uuc"
> > > + help
> > > + A Daemon wait for Freescale/NXP mfgtools host's command.
> > > diff --git a/rules/imx-uuc.make b/rules/imx-uuc.make
> > > new file mode 100644
> > > index 000000000..c708f1be2
> > > --- /dev/null
> > > +++ b/rules/imx-uuc.make
> > > @@ -0,0 +1,60 @@
> > > +# -*-makefile-*-
> > > +#
> > > +# Copyright (C) 2016-2020 by Denis Osterland <Denis.Osterland@diehl.com>
> > > +#
> > > +# For further information about the PTXdist project and license conditions
> > > +# see the README file.
> > > +#
> > > +
> > > +PACKAGES-$(PTXCONF_IMX_UUC) += imx-uuc
> > > +
> > > +#
> > > +# Paths and names
> > > +#
> > > +IMX_UUC_VERSION := 2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc
> > > +IMX_UUC_MD5 := 1a807ab59464385309b92794b43b5caa
> > > +IMX_UUC := imx-uuc-$(IMX_UUC_VERSION)
> > > +IMX_UUC_SUFFIX := tar.gz
> > > +IMX_UUC_URL := https://github.com/NXPmicro/imx-uuc/archive/$(IMX_UUC).$(IMX_UUC_SUFFIX)
> > > +IMX_UUC_SOURCE := $(SRCDIR)/$(IMX_UUC).$(IMX_UUC_SUFFIX)
> > > +IMX_UUC_DIR := $(BUILDDIR)/$(IMX_UUC)
> > > +IMX_UUC_LICENSE := GPL-2.0-or-later
> > > +IMX_UUC_LICENSE_FILES := \
> > > + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
> > > +
> > > +# ----------------------------------------------------------------------------
> > > +# Prepare
> > > +# ----------------------------------------------------------------------------
> > > +
> > > +IMX_UUC_CONF_TOOL := NO
> > > +
> > > +# ----------------------------------------------------------------------------
> > > +# Compile
> > > +# ----------------------------------------------------------------------------
> > > +
> > > +IMX_UUC_MAKE_ENV := $(CROSS_ENV)
> > > +
> > > +# ----------------------------------------------------------------------------
> > > +# Target-Install
> > > +# ----------------------------------------------------------------------------
> > > +
> > > +$(STATEDIR)/imx-uuc.targetinstall:
> > > + @$(call targetinfo)
> > > +
> > > + @$(call install_init, imx-uuc)
> > > + @$(call install_fixup, imx-uuc,PRIORITY,optional)
> > > + @$(call install_fixup, imx-uuc,SECTION,base)
> > > + @$(call install_fixup, imx-uuc,AUTHOR,"Denis Osterland <Denis.Osterland@diehl.com>")
> > > + @$(call install_fixup, imx-uuc,DESCRIPTION,missing)
> > > +
> > > + @$(call install_copy, imx-uuc, 0, 0, 0755, -, /usr/bin/uuc)
> > > + @$(call install_copy, imx-uuc, 0, 0, 0755, -, /usr/bin/ufb)
> > > + @$(call install_copy, imx-uuc, 0, 0, 0755, -, /usr/bin/sdimage)
> > > + @$(call install_alternative, imx-uuc, 0, 0, 0755, /linuxrc)
> > > + @$(call install_alternative, imx-uuc, 0, 0, 0644, /fat)
> > > +
> > > + @$(call install_finish, imx-uuc)
> > > +
> > > + @$(call touch)
> > > +
> > > +# vim: syntax=make
> > > --
> > > 2.26.0
> > >
> > >
> > >
> > > Diehl Connectivity Solutions GmbH
> > > Geschäftsführung: Horst Leonberger
> > > Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
> > > Nürnberg: HRB 32315
> > > ___________________________________________________________________________________________________
> > >
> > > Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
> > > Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht.
> > > Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
> > > - Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie unter https://www.diehl.com/group/de/transparenz-und-informationspflichten/
> > >
> > > The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by
> > > mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.
> > > - For general information on data protection and your respective rights please visit https://www.diehl.com/group/en/transparency-and-information-obligations/
> > >
> > > _______________________________________________
> > > ptxdist mailing list
> > > ptxdist@pengutronix.de
> > >
> >
> >
>
>
> Diehl Connectivity Solutions GmbH
> Geschäftsführung: Horst Leonberger
> Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
> Nürnberg: HRB 32315
> ___________________________________________________________________________________________________
>
> Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
> Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht.
> Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
> - Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie unter https://www.diehl.com/group/de/transparenz-und-informationspflichten/
>
> The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by
> mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.
> - For general information on data protection and your respective rights please visit https://www.diehl.com/group/en/transparency-and-information-obligations/
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
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 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2020-04-02 6:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 17:03 [ptxdist] [PATCH v2 0/3] Freescale/NXP i.MX mfgtools 3.0 Denis Osterland-Heim
2020-03-26 17:03 ` [ptxdist] [PATCH v2 1/3] imx-uuc: new package Denis Osterland-Heim
2020-03-27 12:06 ` Michael Olbrich
2020-03-27 13:07 ` Denis Osterland-Heim
2020-03-31 5:29 ` [ptxdist] [PATCH v2] fixup! " Denis Osterland-Heim
2020-04-01 15:08 ` Michael Olbrich
2020-04-02 6:28 ` Denis Osterland-Heim
2020-04-02 6:39 ` Michael Olbrich [this message]
2020-04-02 15:03 ` [ptxdist] [v2] " Michael Olbrich
2020-04-03 5:58 ` [ptxdist] [APPLIED] [v2,1/3] " Michael Olbrich
2020-03-26 17:03 ` [ptxdist] [PATCH v2 2/3] host-libzip: " Denis Osterland-Heim
2020-04-03 5:58 ` [ptxdist] [APPLIED] [v2,2/3] " Michael Olbrich
2020-03-26 17:03 ` [ptxdist] [PATCH v2 3/3] host-mfgtools: " Denis Osterland-Heim
2020-04-02 15:03 ` [ptxdist] [v2,3/3] " Michael Olbrich
2020-03-27 12:41 ` [ptxdist] [PATCH v2 0/3] Freescale/NXP i.MX mfgtools 3.0 Michael Olbrich
2020-03-27 13:01 ` Denis Osterland-Heim
2020-03-27 13:16 ` Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200402063941.GH7599@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox