From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.lab.pengutronix.de) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jJeyv-0002qS-0q for ptxdist@pengutronix.de; Wed, 01 Apr 2020 17:08:41 +0200 Received: from mol by dude02.lab.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1jJeyu-0007pt-O7 for ptxdist@pengutronix.de; Wed, 01 Apr 2020 17:08:40 +0200 Date: Wed, 1 Apr 2020 17:08:40 +0200 From: Michael Olbrich Message-ID: <20200401150840.GB2612@pengutronix.de> References: <20200327120651.GA15993@pengutronix.de> <20200331052807.5841-1-Denis.Osterland@diehl.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200331052807.5841-1-Denis.Osterland@diehl.com> Subject: Re: [ptxdist] [PATCH v2] fixup! imx-uuc: new package List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de 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 > --- > ...001-sh-does-not-support-array-syntax.patch | 117 ++++++++++++++++++ > .../series | 4 + Now we have two patches :-/. I'll do another fixup myself. 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-gd6afb27e55d73d7ad08cd2dd5= 1c784d8ec9694dc/0001-sh-does-not-support-array-syntax.patch > create mode 100644 patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd5= 1c784d8ec9694dc/series > create mode 100644 rules/imx-uuc.in > create mode 100644 rules/imx-uuc.make > = > diff --git a/patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8= ec9694dc/0001-sh-does-not-support-array-syntax.patch b/patches/imx-uuc-2019= -11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc/0001-sh-does-not-support-a= rray-syntax.patch > new file mode 100644 > index 000000000..995baea19 > --- /dev/null > +++ b/patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694d= c/0001-sh-does-not-support-array-syntax.patch > @@ -0,0 +1,117 @@ > +From: Denis Osterland-Heim > +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 > +--- > + 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=3D0; > + = > + UDC_DIR=3D/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" =3D=3D "$1" ]; then > + return 1; > +@@ -45,7 +33,8 @@ function launch_uuc() { > + echo 0x066F > idVendor > + = > + if [[ ${cmdline} =3D=3D *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} =3D=3D *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` =3D=3D *inet6* ]]; then > +- break; > +- fi > +- sleep 1 > +- done > +- > +- if [ -e /find_one ]; then > +- exit 0 > +- fi > +- > +- touch /find_one > +- > +- launch_dhcpd $2 > +- > +- remote=3D"" > +- while [[ "$remote" =3D=3D "" ]]; > +- do > +- sleep 2 > +- echo retry get remote ipaddress > +- ping6 -c2 -I usb$2 ff02::1 > +- > +- remote=3D`ip -6 neighbor show dev usb$2` > +- remote=3D(${remote}) > +- remote=3D${remote[0]} > +- done > +- > +- nfs=3D${cmdline#*nfsroot=3D} > +- nfs=3D($nfs) > +- nfs=3D${nfs[0]} > +- > +- nfs=3D${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]=3D$entry; > ++ files=3D"$files $entry"; > + id=3D$last; > + last=3D`expr $last + 1`; > + echo "Found New UDC: $entry"; > diff --git a/patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8= ec9694dc/series b/patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c78= 4d8ec9694dc/series > new file mode 100644 > index 000000000..125c531a3 > --- /dev/null > +++ b/patches/imx-uuc-2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694d= c/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=3Dcommunication > + > +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 > +# > +# For further information about the PTXdist project and license conditio= ns > +# see the README file. > +# > + > +PACKAGES-$(PTXCONF_IMX_UUC) +=3D imx-uuc > + > +# > +# Paths and names > +# > +IMX_UUC_VERSION :=3D 2019-11-07-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694= dc > +IMX_UUC_MD5 :=3D 1a807ab59464385309b92794b43b5caa > +IMX_UUC :=3D imx-uuc-$(IMX_UUC_VERSION) > +IMX_UUC_SUFFIX :=3D tar.gz > +IMX_UUC_URL :=3D https://github.com/NXPmicro/imx-uuc/archive/$(IMX_UUC)= .$(IMX_UUC_SUFFIX) > +IMX_UUC_SOURCE :=3D $(SRCDIR)/$(IMX_UUC).$(IMX_UUC_SUFFIX) > +IMX_UUC_DIR :=3D $(BUILDDIR)/$(IMX_UUC) > +IMX_UUC_LICENSE :=3D GPL-2.0-or-later > +IMX_UUC_LICENSE_FILES :=3D \ > + file://COPYING;md5=3Db234ee4d69f5fce4486a80fdaf4a4263 > + > +# ----------------------------------------------------------------------= ------ > +# Prepare > +# ----------------------------------------------------------------------= ------ > + > +IMX_UUC_CONF_TOOL :=3D NO > + > +# ----------------------------------------------------------------------= ------ > +# Compile > +# ----------------------------------------------------------------------= ------ > + > +IMX_UUC_MAKE_ENV :=3D $(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 ") > + @$(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=3Dmake > -- = > 2.26.0 > = > = > = > Diehl Connectivity Solutions GmbH > Gesch=E4ftsf=FChrung: Horst Leonberger > Sitz der Gesellschaft: N=FCrnberg - Registergericht: Amtsgericht > N=FCrnberg: HRB 32315 > _________________________________________________________________________= __________________________ > = > Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-M= ail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. > Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhal= ten 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-informationspflich= ten/ > = > The contents of the above mentioned e-mail is not legally binding. This e= -mail contains confidential and/or legally protected information. Please in= form us if you have received this e-mail by > mistake and delete it in such a case. Each unauthorized reproduction, dis= closure, alteration, distribution and/or publication of this e-mail is stri= ctly prohibited. = > - For general information on data protection and your respective rights p= lease visit https://www.diehl.com/group/en/transparency-and-information-obl= igations/ > = > _______________________________________________ > 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