From f7f29172cb11fabf1d017ecdadaf32ea37eca4df Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Sun, 10 Mar 2013 02:32:16 +1100 Subject: Updated Linux build files and fixed a string formatting warning in Heimdall Frontend. --- heimdall-frontend/Source/Packaging.cpp | 2 +- heimdall/Makefile.am | 3 +-- heimdall/Makefile.in | 11 +++-------- heimdall/autom4te.cache/output.0 | 4 ++-- heimdall/autom4te.cache/output.1 | 4 ++-- heimdall/autom4te.cache/traces.0 | 5 +---- heimdall/autom4te.cache/traces.1 | 5 +---- heimdall/configure | 4 ++-- heimdall/configure.ac | 4 ++-- libpit/Makefile.in | 2 +- libpit/config.guess | 0 libpit/config.sub | 0 libpit/depcomp | 0 libpit/missing | 0 14 files changed, 16 insertions(+), 28 deletions(-) mode change 100644 => 100755 libpit/config.guess mode change 100644 => 100755 libpit/config.sub mode change 100644 => 100755 libpit/depcomp mode change 100644 => 100755 libpit/missing diff --git a/heimdall-frontend/Source/Packaging.cpp b/heimdall-frontend/Source/Packaging.cpp index 9bf7d46..c4d3a51 100644 --- a/heimdall-frontend/Source/Packaging.cpp +++ b/heimdall-frontend/Source/Packaging.cpp @@ -301,7 +301,7 @@ bool Packaging::WriteTarEntry(const QString& filePath, QTemporaryFile *tarFile, // Note: We don't support base-256 encoding. Support could be added later. sprintf(tarHeader.fields.size, "%011llo", file.size()); - sprintf(tarHeader.fields.modifiedTime, "%011llo", qtFileInfo.lastModified().toTime_t()); + sprintf(tarHeader.fields.modifiedTime, "%u", qtFileInfo.lastModified().toTime_t()); // Regular File tarHeader.fields.typeFlag = '0'; diff --git a/heimdall/Makefile.am b/heimdall/Makefile.am index dcebb73..f1a659f 100644 --- a/heimdall/Makefile.am +++ b/heimdall/Makefile.am @@ -9,7 +9,6 @@ heimdall_SOURCES = source/Arguments.cpp \ source/ClosePcScreenAction.cpp \ source/DetectAction.cpp \ source/DownloadPitAction.cpp \ - source/DumpAction.cpp \ source/FlashAction.cpp \ source/HelpAction.cpp \ source/InfoAction.cpp \ @@ -31,7 +30,7 @@ install-data-hook: @echo "IMPORTANT - You must reboot your machine or execute the following as root:" if UDEVADM - @echo "udevadm control --reload_rules" + @echo "udevadm control --reload-rules" else @echo "service udev restart" endif diff --git a/heimdall/Makefile.in b/heimdall/Makefile.in index 991cdd6..a6422e5 100644 --- a/heimdall/Makefile.in +++ b/heimdall/Makefile.in @@ -60,7 +60,7 @@ am_heimdall_OBJECTS = source/Arguments.$(OBJEXT) \ source/BridgeManager.$(OBJEXT) \ source/ClosePcScreenAction.$(OBJEXT) \ source/DetectAction.$(OBJEXT) \ - source/DownloadPitAction.$(OBJEXT) source/DumpAction.$(OBJEXT) \ + source/DownloadPitAction.$(OBJEXT) \ source/FlashAction.$(OBJEXT) source/HelpAction.$(OBJEXT) \ source/InfoAction.$(OBJEXT) source/Interface.$(OBJEXT) \ source/main.$(OBJEXT) source/PrintPitAction.$(OBJEXT) \ @@ -252,7 +252,6 @@ heimdall_SOURCES = source/Arguments.cpp \ source/ClosePcScreenAction.cpp \ source/DetectAction.cpp \ source/DownloadPitAction.cpp \ - source/DumpAction.cpp \ source/FlashAction.cpp \ source/HelpAction.cpp \ source/InfoAction.cpp \ @@ -381,8 +380,6 @@ source/DetectAction.$(OBJEXT): source/$(am__dirstamp) \ source/$(DEPDIR)/$(am__dirstamp) source/DownloadPitAction.$(OBJEXT): source/$(am__dirstamp) \ source/$(DEPDIR)/$(am__dirstamp) -source/DumpAction.$(OBJEXT): source/$(am__dirstamp) \ - source/$(DEPDIR)/$(am__dirstamp) source/FlashAction.$(OBJEXT): source/$(am__dirstamp) \ source/$(DEPDIR)/$(am__dirstamp) source/HelpAction.$(OBJEXT): source/$(am__dirstamp) \ @@ -410,7 +407,6 @@ mostlyclean-compile: -rm -f source/ClosePcScreenAction.$(OBJEXT) -rm -f source/DetectAction.$(OBJEXT) -rm -f source/DownloadPitAction.$(OBJEXT) - -rm -f source/DumpAction.$(OBJEXT) -rm -f source/FlashAction.$(OBJEXT) -rm -f source/HelpAction.$(OBJEXT) -rm -f source/InfoAction.$(OBJEXT) @@ -428,7 +424,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/ClosePcScreenAction.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/DetectAction.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/DownloadPitAction.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/DumpAction.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/FlashAction.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/HelpAction.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/InfoAction.Po@am__quote@ @@ -635,7 +630,7 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -824,7 +819,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-udevrulesDATA @LINUXTARGET_TRUE@ @echo "" @LINUXTARGET_TRUE@ @echo "IMPORTANT - You must reboot your machine or execute the following as root:" -@LINUXTARGET_TRUE@@UDEVADM_TRUE@ @echo "udevadm control --reload_rules" +@LINUXTARGET_TRUE@@UDEVADM_TRUE@ @echo "udevadm control --reload-rules" @LINUXTARGET_TRUE@@UDEVADM_FALSE@ @echo "service udev restart" @LINUXTARGET_TRUE@ @echo "" diff --git a/heimdall/autom4te.cache/output.0 b/heimdall/autom4te.cache/output.0 index d4644be..437e74c 100644 --- a/heimdall/autom4te.cache/output.0 +++ b/heimdall/autom4te.cache/output.0 @@ -2298,7 +2298,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_udevadminstalled="" + ac_cv_prog_udevadminstalled=""yes"" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -15646,7 +15646,7 @@ else LINUXTARGET_FALSE= fi - if test x$udevadmninstalled = xtrue; then + if test x$udevadminstalled = x"yes"; then UDEVADM_TRUE= UDEVADM_FALSE='#' else diff --git a/heimdall/autom4te.cache/output.1 b/heimdall/autom4te.cache/output.1 index 9c6e889..b28e200 100644 --- a/heimdall/autom4te.cache/output.1 +++ b/heimdall/autom4te.cache/output.1 @@ -2298,7 +2298,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_udevadminstalled="" + ac_cv_prog_udevadminstalled=""yes"" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -15642,7 +15642,7 @@ else LINUXTARGET_FALSE= fi - if test x$udevadmninstalled = xtrue; then + if test x$udevadminstalled = x"yes"; then UDEVADM_TRUE= UDEVADM_FALSE='#' else diff --git a/heimdall/autom4te.cache/traces.0 b/heimdall/autom4te.cache/traces.0 index 22922b9..d2b52ed 100644 --- a/heimdall/autom4te.cache/traces.0 +++ b/heimdall/autom4te.cache/traces.0 @@ -2247,9 +2247,6 @@ m4trace:configure.ac:3: -1- m4_pattern_allow([^DEPS_LIBS$]) m4trace:configure.ac:3: -1- PKG_CHECK_EXISTS([libusb-1.0 >= 1.0.8], [pkg_cv_[]DEPS_CFLAGS=`$PKG_CONFIG --[]cflags "libusb-1.0 >= 1.0.8" 2>/dev/null`], [pkg_failed=yes]) m4trace:configure.ac:3: -1- PKG_CHECK_EXISTS([libusb-1.0 >= 1.0.8], [pkg_cv_[]DEPS_LIBS=`$PKG_CONFIG --[]libs "libusb-1.0 >= 1.0.8" 2>/dev/null`], [pkg_failed=yes]) m4trace:configure.ac:3: -1- _PKG_SHORT_ERRORS_SUPPORTED -m4trace:configure.ac:4: -1- _m4_warn([obsolete], [The macro `AC_PROGRAM_CHECK' is obsolete. -You should run autoupdate.], [../../lib/autoconf/oldnames.m4:62: AC_PROGRAM_CHECK is expanded from... -configure.ac:4: the top level]) m4trace:configure.ac:4: -1- m4_pattern_allow([^udevadminstalled$]) m4trace:configure.ac:5: -1- m4_pattern_allow([^build$]) m4trace:configure.ac:5: -1- m4_pattern_allow([^build_cpu$]) @@ -2497,7 +2494,7 @@ m4trace:configure.ac:41: -1- m4_pattern_allow([^LINUXTARGET_TRUE$]) m4trace:configure.ac:41: -1- m4_pattern_allow([^LINUXTARGET_FALSE$]) m4trace:configure.ac:41: -1- _AM_SUBST_NOTMAKE([LINUXTARGET_TRUE]) m4trace:configure.ac:41: -1- _AM_SUBST_NOTMAKE([LINUXTARGET_FALSE]) -m4trace:configure.ac:42: -1- AM_CONDITIONAL([UDEVADM], [test x$udevadmninstalled = xtrue]) +m4trace:configure.ac:42: -1- AM_CONDITIONAL([UDEVADM], [test x$udevadminstalled = x"yes"]) m4trace:configure.ac:42: -1- m4_pattern_allow([^UDEVADM_TRUE$]) m4trace:configure.ac:42: -1- m4_pattern_allow([^UDEVADM_FALSE$]) m4trace:configure.ac:42: -1- _AM_SUBST_NOTMAKE([UDEVADM_TRUE]) diff --git a/heimdall/autom4te.cache/traces.1 b/heimdall/autom4te.cache/traces.1 index 9a30498..efce95d 100644 --- a/heimdall/autom4te.cache/traces.1 +++ b/heimdall/autom4te.cache/traces.1 @@ -153,9 +153,6 @@ m4trace:configure.ac:3: -1- m4_pattern_allow([^DEPS_CFLAGS$]) m4trace:configure.ac:3: -1- AC_SUBST([DEPS_LIBS]) m4trace:configure.ac:3: -1- AC_SUBST_TRACE([DEPS_LIBS]) m4trace:configure.ac:3: -1- m4_pattern_allow([^DEPS_LIBS$]) -m4trace:configure.ac:4: -1- _m4_warn([obsolete], [The macro `AC_PROGRAM_CHECK' is obsolete. -You should run autoupdate.], [../../lib/autoconf/oldnames.m4:62: AC_PROGRAM_CHECK is expanded from... -configure.ac:4: the top level]) m4trace:configure.ac:4: -1- AC_SUBST([udevadminstalled]) m4trace:configure.ac:4: -1- AC_SUBST_TRACE([udevadminstalled]) m4trace:configure.ac:4: -1- m4_pattern_allow([^udevadminstalled$]) @@ -588,7 +585,7 @@ m4trace:configure.ac:41: -1- AC_SUBST_TRACE([LINUXTARGET_FALSE]) m4trace:configure.ac:41: -1- m4_pattern_allow([^LINUXTARGET_FALSE$]) m4trace:configure.ac:41: -1- _AM_SUBST_NOTMAKE([LINUXTARGET_TRUE]) m4trace:configure.ac:41: -1- _AM_SUBST_NOTMAKE([LINUXTARGET_FALSE]) -m4trace:configure.ac:42: -1- AM_CONDITIONAL([UDEVADM], [test x$udevadmninstalled = xtrue]) +m4trace:configure.ac:42: -1- AM_CONDITIONAL([UDEVADM], [test x$udevadminstalled = x"yes"]) m4trace:configure.ac:42: -1- AC_SUBST([UDEVADM_TRUE]) m4trace:configure.ac:42: -1- AC_SUBST_TRACE([UDEVADM_TRUE]) m4trace:configure.ac:42: -1- m4_pattern_allow([^UDEVADM_TRUE$]) diff --git a/heimdall/configure b/heimdall/configure index 61f534d..ff9808f 100755 --- a/heimdall/configure +++ b/heimdall/configure @@ -2298,7 +2298,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_udevadminstalled="" + ac_cv_prog_udevadminstalled=""yes"" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -15642,7 +15642,7 @@ else LINUXTARGET_FALSE= fi - if test x$udevadmninstalled = xtrue; then + if test x$udevadminstalled = x"yes"; then UDEVADM_TRUE= UDEVADM_FALSE='#' else diff --git a/heimdall/configure.ac b/heimdall/configure.ac index 601c550..02ad4af 100644 --- a/heimdall/configure.ac +++ b/heimdall/configure.ac @@ -1,7 +1,7 @@ AC_INIT([Heimdall], [1.3], [bug-report@glassechidna.com.au], [heimdall], [http://www.glassechidna.com.au/]) AC_PREREQ([2.59]) PKG_CHECK_MODULES([DEPS], [libusb-1.0 >= 1.0.8]) -AC_PROGRAM_CHECK(udevadminstalled, udevadm) +AC_CHECK_PROG(udevadminstalled, udevadm, "yes") AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign]) AC_CONFIG_MACRO_DIR([m4]) @@ -39,7 +39,7 @@ case $target in esac AM_CONDITIONAL([LINUXTARGET], [test x$linuxtarget = xtrue]) -AM_CONDITIONAL([UDEVADM], [test x$udevadmninstalled = xtrue]) +AM_CONDITIONAL([UDEVADM], [test x$udevadminstalled = x"yes"]) AC_C_BIGENDIAN diff --git a/libpit/Makefile.in b/libpit/Makefile.in index f617522..80bc269 100644 --- a/libpit/Makefile.in +++ b/libpit/Makefile.in @@ -533,7 +533,7 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff --git a/libpit/config.guess b/libpit/config.guess old mode 100644 new mode 100755 diff --git a/libpit/config.sub b/libpit/config.sub old mode 100644 new mode 100755 diff --git a/libpit/depcomp b/libpit/depcomp old mode 100644 new mode 100755 diff --git a/libpit/missing b/libpit/missing old mode 100644 new mode 100755 -- cgit v1.1