Date: Fri, 30 Nov 2012 13:46:27 +0100 From: Thomas Waldecker <thomas.waldecker(a)gmail.com&gt; To: powertop(a)lists.01.org Cc: Thomas Waldecker <thomas.waldecker(a)tqs.de&gt; Subject: [Powertop] [PATCH] csstoh.sh shell script fixes cross compiling issues X-Mailer: git-send-email 1.7.11.7 From: Thomas Waldecker <thomas.waldecker(a)tqs.de&gt; Added the csstoh.sh shell script from Igor Zhbanov found here: http://lists.01.org/pipermail/powertop/2012-July/000151.html also patched the Makefile.am to use the csstoh.sh script. The compiled csstoh binary doesn't work for cross compiling, however Igors Patch never got applied upstream. --- src/Makefile.am | 8 +++----- src/csstoh.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 5 deletions(-) create mode 100755 src/csstoh.sh

diff --git a/src/Makefile.am b/src/Makefile.am index f60426a..a53d942 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,6 @@ AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = -I ../m4 -noinst_PROGRAMS = csstoh -csstoh_SOURCES = csstoh.c - sbin_PROGRAMS = powertop nodist_powertop_SOURCES = css.h @@ -48,6 +45,7 @@ AM_LDFLAGS = $(LIBS) $(NCURSES_LIBS) $(PCIUTILS_LIBS) $(LIBNL_LIBS) $(LIBZ_LIBS) BUILT_SOURCES = css.h CLEANFILES = css.h -css.h: csstoh powertop.css - ./csstoh "$(srcdir)"/powertop.css css.h +css.h: powertop.css + chmod +x ./csstoh.sh + ./csstoh.sh "$(srcdir)"/powertop.css css.h diff --git a/src/csstoh.sh b/src/csstoh.sh new file mode 100755 index 0000000..5918d12 --- /dev/null +++ b/src/csstoh.sh @@ -0,0 +1,45 @@ +#!/bin/bash +# +# This program file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program in a file named COPYING; if not, write to the +# Free Software Foundation, Inc, +# 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301 USA +# or just google for it. +# +# Written by Igor Zhbanov<i.zhbanov at samsung.com> + + +if [ $# -lt 2 ]; then + echo "Usage: csstoh.sh cssfile header.h" + exit 1 +fi + +if [ ! -r $1 ]; then + echo "Can't find file $1" + exit 1 +fi + +if ! echo -n>$2; then + echo "Can't open file $2 for writing." + exit 1 +fi + +echo "#ifndef __INCLUDE_GUARD_CCS_H">> $2 +echo "#define __INCLUDE_GUARD_CCS_H">> $2 +echo>> $2 +echo "const char css[] = ">> $2 + +sed -r 's/^(.*)$/\t\"\1\\n\"/' $1>> $2 + +echo ";">> $2 +echo "#endif">> $2 -- 1.7.9.5 _______________________________________________ PowerTop mailing list PowerTop(a)lists.01.org https://lists.01.org/mailman/listinfo/powertop

Updated the shellscript with changes made by Igor posted in mailing list https://lists.01.org/pipermail/powertop/2012-July/000165.html ---

From ethical point of view, I think only original author can change this line

.gitignore | 1 - src/Makefile.am | 3 +-- src/csstoh.sh | 21 ++++++++++----------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 96ffdba..35d41c2 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,6 @@ po/*.gmo po/stamp-po src/powertop src/css.h -src/csstoh src/Makefile.in src/.deps/ src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index a53d942..398b8a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,6 +46,5 @@ AM_LDFLAGS = $(LIBS) $(NCURSES_LIBS) $(PCIUTILS_LIBS) $(LIBNL_LIBS) $(LIBZ_LIBS) BUILT_SOURCES = css.h CLEANFILES = css.h css.h: powertop.css - chmod +x ./csstoh.sh - ./csstoh.sh "$(srcdir)"/powertop.css css.h + $(SHELL) ./csstoh.sh powertop.css css.h diff --git a/src/csstoh.sh b/src/csstoh.sh index 5918d12..9d4100b 100755 --- a/src/csstoh.sh +++ b/src/csstoh.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # This program file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -16,8 +16,7 @@ # Boston, MA 02110-1301 USA # or just google for it. # -# Written by Igor Zhbanov<i.zhbanov at samsung.com> - +# Written by Igor Zhbanov <i.zhbanov at samsung.com> if [ $# -lt 2 ]; then echo "Usage: csstoh.sh cssfile header.h" @@ -29,17 +28,17 @@ if [ ! -r $1 ]; then exit 1 fi -if ! echo -n>$2; then +if ! echo -n >$2; then echo "Can't open file $2 for writing." exit 1 fi -echo "#ifndef __INCLUDE_GUARD_CCS_H">> $2 -echo "#define __INCLUDE_GUARD_CCS_H">> $2 -echo>> $2 -echo "const char css[] = ">> $2 +echo "#ifndef __INCLUDE_GUARD_CCS_H" >> $2 +echo "#define __INCLUDE_GUARD_CCS_H" >> $2 +echo >> $2 +echo "const char css[] = " >> $2 -sed -r 's/^(.*)$/\t\"\1\\n\"/' $1>> $2 +sed -r 's/^(.*)$/\t\"\1\\n\"/' $1 >> $2 -echo ";">> $2 -echo "#endif">> $2 +echo ";" >> $2 +echo "#endif" >> $2 -- 1.8.1 _______________________________________________ PowerTop mailing list PowerTop(a)lists.01.org https://lists.01.org/mailman/listinfo/powertop

Updated the shellscript with changes made by Igor posted in mailing list https://lists.01.org/pipermail/powertop/2012-July/000165.html

--- .gitignore | 1 - src/Makefile.am | 3 +-- src/csstoh.sh | 21 ++++++++++----------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 96ffdba..35d41c2 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,6 @@ po/*.gmo po/stamp-po src/powertop src/css.h -src/csstoh src/Makefile.in src/.deps/ src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index a53d942..398b8a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,6 +46,5 @@ AM_LDFLAGS = $(LIBS) $(NCURSES_LIBS) $(PCIUTILS_LIBS) $(LIBNL_LIBS) $(LIBZ_LIBS) BUILT_SOURCES = css.h CLEANFILES = css.h css.h: powertop.css - chmod +x ./csstoh.sh - ./csstoh.sh "$(srcdir)"/powertop.css css.h + $(SHELL) ./csstoh.sh powertop.css css.h diff --git a/src/csstoh.sh b/src/csstoh.sh index 5918d12..9d4100b 100755 --- a/src/csstoh.sh +++ b/src/csstoh.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # This program file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -16,8 +16,7 @@ # Boston, MA 02110-1301 USA # or just google for it. # -# Written by Igor Zhbanov<i.zhbanov at samsung.com> - +# Written by Igor Zhbanov <i.zhbanov at samsung.com> if [ $# -lt 2 ]; then echo "Usage: csstoh.sh cssfile header.h" @@ -29,17 +28,17 @@ if [ ! -r $1 ]; then exit 1 fi -if ! echo -n>$2; then +if ! echo -n >$2; then echo "Can't open file $2 for writing." exit 1 fi -echo "#ifndef __INCLUDE_GUARD_CCS_H">> $2 -echo "#define __INCLUDE_GUARD_CCS_H">> $2 -echo>> $2 -echo "const char css[] = ">> $2 +echo "#ifndef __INCLUDE_GUARD_CCS_H" >> $2 +echo "#define __INCLUDE_GUARD_CCS_H" >> $2 +echo >> $2 +echo "const char css[] = " >> $2 -sed -r 's/^(.*)$/\t\"\1\\n\"/' $1>> $2 +sed -r 's/^(.*)$/\t\"\1\\n\"/' $1 >> $2 -echo ";">> $2 -echo "#endif">> $2 +echo ";" >> $2 +echo "#endif" >> $2

Updated the shellscript with changes made by Igor posted in mailing list https://lists.01.org/pipermail/powertop/2012-July/000165.html Signed-off-by: Thomas Waldecker <thomas.waldecker(a)gmail.com&gt; --- src/Makefile.am | 3 +-- src/csstoh.sh | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index a53d942..398b8a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,6 +46,5 @@ AM_LDFLAGS = $(LIBS) $(NCURSES_LIBS) $(PCIUTILS_LIBS) $(LIBNL_LIBS) $(LIBZ_LIBS) BUILT_SOURCES = css.h CLEANFILES = css.h css.h: powertop.css - chmod +x ./csstoh.sh - ./csstoh.sh "$(srcdir)"/powertop.css css.h + $(SHELL) ./csstoh.sh powertop.css css.h diff --git a/src/csstoh.sh b/src/csstoh.sh index 5918d12..9d4100b 100755 --- a/src/csstoh.sh +++ b/src/csstoh.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # This program file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -16,8 +16,7 @@ # Boston, MA 02110-1301 USA # or just google for it. # -# Written by Igor Zhbanov<i.zhbanov at samsung.com> - +# Written by Igor Zhbanov <i.zhbanov at samsung.com> if [ $# -lt 2 ]; then echo "Usage: csstoh.sh cssfile header.h" @@ -29,17 +28,17 @@ if [ ! -r $1 ]; then exit 1 fi -if ! echo -n>$2; then +if ! echo -n >$2; then echo "Can't open file $2 for writing." exit 1 fi -echo "#ifndef __INCLUDE_GUARD_CCS_H">> $2 -echo "#define __INCLUDE_GUARD_CCS_H">> $2 -echo>> $2 -echo "const char css[] = ">> $2 +echo "#ifndef __INCLUDE_GUARD_CCS_H" >> $2 +echo "#define __INCLUDE_GUARD_CCS_H" >> $2 +echo >> $2 +echo "const char css[] = " >> $2 -sed -r 's/^(.*)$/\t\"\1\\n\"/' $1>> $2 +sed -r 's/^(.*)$/\t\"\1\\n\"/' $1 >> $2 -echo ";">> $2 -echo "#endif">> $2 +echo ";" >> $2 +echo "#endif" >> $2

On Tue, 05 Feb 2013 13:50:34 +0400 Igor Zhbanov <i.zhbanov(a)samsung.com&gt; wrote: > Thomas Waldecker wrote: >> Updated the shellscript with changes made by Igor posted in mailing list >> https://lists.01.org/pipermail/powertop/2012-July/000165.html >> >> Signed-off-by: Thomas Waldecker <thomas.waldecker(a)gmail.com&gt; >> --- >> src/Makefile.am | 3 +-- >> src/csstoh.sh | 21 ++++++++++----------- >> 2 files changed, 11 insertions(+), 13 deletions(-) >> >> diff --git a/src/Makefile.am b/src/Makefile.am >> index a53d942..398b8a7 100644 >> --- a/src/Makefile.am >> +++ b/src/Makefile.am >> @@ -46,6 +46,5 @@ AM_LDFLAGS = $(LIBS) $(NCURSES_LIBS) $(PCIUTILS_LIBS) $(LIBNL_LIBS) $(LIBZ_LIBS) >> BUILT_SOURCES = css.h >> CLEANFILES = css.h >> css.h: powertop.css >> - chmod +x ./csstoh.sh >> - ./csstoh.sh "$(srcdir)"/powertop.css css.h >> + $(SHELL) ./csstoh.sh powertop.css css.h >> >> diff --git a/src/csstoh.sh b/src/csstoh.sh >> index 5918d12..9d4100b 100755 >> --- a/src/csstoh.sh >> +++ b/src/csstoh.sh >> @@ -1,4 +1,4 @@ >> -#!/bin/bash >> +#!/bin/sh >> # >> # This program file is free software; you can redistribute it and/or modify it >> # under the terms of the GNU General Public License as published by the >> @@ -16,8 +16,7 @@ >> # Boston, MA 02110-1301 USA >> # or just google for it. >> # >> -# Written by Igor Zhbanov<i.zhbanov at samsung.com> >> - >> +# Written by Igor Zhbanov <i.zhbanov at samsung.com> >> >> if [ $# -lt 2 ]; then >> echo "Usage: csstoh.sh cssfile header.h" >> @@ -29,17 +28,17 @@ if [ ! -r $1 ]; then >> exit 1 >> fi >> >> -if ! echo -n>$2; then >> +if ! echo -n >$2; then >> echo "Can't open file $2 for writing." >> exit 1 >> fi >> >> -echo "#ifndef __INCLUDE_GUARD_CCS_H">> $2 >> -echo "#define __INCLUDE_GUARD_CCS_H">> $2 >> -echo>> $2 >> -echo "const char css[] = ">> $2 >> +echo "#ifndef __INCLUDE_GUARD_CCS_H" >> $2 >> +echo "#define __INCLUDE_GUARD_CCS_H" >> $2 >> +echo >> $2 >> +echo "const char css[] = " >> $2 >> >> -sed -r 's/^(.*)$/\t\"\1\\n\"/' $1>> $2 >> +sed -r 's/^(.*)$/\t\"\1\\n\"/' $1 >> $2 >> >> -echo ";">> $2 >> -echo "#endif">> $2 >> +echo ";" >> $2 >> +echo "#endif" >> $2 > The space characters issue was because of bad mail-client. > The spaces were always there. :-) > Last patch was sent by git, so it was transmitted exactly. > > Also it the last version of the patch /bin/bash was changed to /bin/sh > for better portability. So the (this) last version is better. :-) > I use it for cross-compilation. My own version is the same except > of my e-mail. I have "@" instead of "at" in it. The "at" word was created > by bad mail client. But this is not important. :-) > So would you like us to go ahead and apply this patch?