Skip to content

Commit

Permalink
More linux-specific fixes/changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Benjamin-Dobell
Benjamin-Dobell committed Jun 1, 2011
1 parent da48d03 commit 1e28948
Show file tree
Hide file tree
Showing 11 changed files with 878 additions and 678 deletions.
5 changes: 5 additions & 0 deletions heimdall/Makefile.am
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ udevrulesdir = /lib/udev/rules.d
udevrules_DATA = 60-heimdall-galaxy-s.rules udevrules_DATA = 60-heimdall-galaxy-s.rules


install-data-hook: install-data-hook:
if UDEVADM
sudo udevadm control --reload_rules sudo udevadm control --reload_rules
else
sudo service udev restart
endif

endif endif


dist_noinst_SCRIPTS = autogen.sh dist_noinst_SCRIPTS = autogen.sh
16 changes: 12 additions & 4 deletions heimdall/Makefile.in
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(udevrulesdir)"
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
am__dirstamp = $(am__leading_dot)dirstamp am__dirstamp = $(am__leading_dot)dirstamp
am_heimdall_OBJECTS = source/BridgeManager.$(OBJEXT) \ am_heimdall_OBJECTS = source/BridgeManager.$(OBJEXT) \
source/InterfaceManager.$(OBJEXT) source/main.$(OBJEXT) source/InterfaceManager.$(OBJEXT) source/main.$(OBJEXT) \
source/PitData.$(OBJEXT)
heimdall_OBJECTS = $(am_heimdall_OBJECTS) heimdall_OBJECTS = $(am_heimdall_OBJECTS)
am__DEPENDENCIES_1 = am__DEPENDENCIES_1 =
heimdall_DEPENDENCIES = $(am__DEPENDENCIES_1) heimdall_DEPENDENCIES = $(am__DEPENDENCIES_1)
Expand Down Expand Up @@ -247,6 +248,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
udevadminstalled = @udevadminstalled@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
AM_CPPFLAGS = $(DEPS_CFLAGS) AM_CPPFLAGS = $(DEPS_CFLAGS)
Expand All @@ -259,8 +261,9 @@ heimdall_SOURCES = source/BeginDumpPacket.h source/BridgeManager.cpp \
source/FlashPartPitFilePacket.h source/Heimdall.h \ source/FlashPartPitFilePacket.h source/Heimdall.h \
source/InboundPacket.h source/InterfaceManager.cpp source/InterfaceManager.h \ source/InboundPacket.h source/InterfaceManager.cpp source/InterfaceManager.h \
source/main.cpp source/OutboundPacket.h source/Packet.h source/PitFilePacket.h \ source/main.cpp source/OutboundPacket.h source/Packet.h source/PitFilePacket.h \
source/PitFileResponse.h source/RebootDevicePacket.h source/ReceiveFilePartPacket.h \ source/PitFileResponse.h source/EndSessionPacket.h source/ReceiveFilePartPacket.h \
source/ResponsePacket.h source/SendFilePartPacket.h source/SendFilePartResponse.h source/ResponsePacket.h source/SendFilePartPacket.h \
source/SendFilePartResponse.h source/PitData.cpp source/PitData.h


heimdall_LDADD = $(DEPS_LIBS) heimdall_LDADD = $(DEPS_LIBS)
@LINUXTARGET_TRUE@udevrulesdir = /lib/udev/rules.d @LINUXTARGET_TRUE@udevrulesdir = /lib/udev/rules.d
Expand Down Expand Up @@ -377,6 +380,8 @@ source/InterfaceManager.$(OBJEXT): source/$(am__dirstamp) \
source/$(DEPDIR)/$(am__dirstamp) source/$(DEPDIR)/$(am__dirstamp)
source/main.$(OBJEXT): source/$(am__dirstamp) \ source/main.$(OBJEXT): source/$(am__dirstamp) \
source/$(DEPDIR)/$(am__dirstamp) source/$(DEPDIR)/$(am__dirstamp)
source/PitData.$(OBJEXT): source/$(am__dirstamp) \
source/$(DEPDIR)/$(am__dirstamp)
heimdall$(EXEEXT): $(heimdall_OBJECTS) $(heimdall_DEPENDENCIES) heimdall$(EXEEXT): $(heimdall_OBJECTS) $(heimdall_DEPENDENCIES)
@rm -f heimdall$(EXEEXT) @rm -f heimdall$(EXEEXT)
$(CXXLINK) $(heimdall_OBJECTS) $(heimdall_LDADD) $(LIBS) $(CXXLINK) $(heimdall_OBJECTS) $(heimdall_LDADD) $(LIBS)
Expand All @@ -385,13 +390,15 @@ mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
-rm -f source/BridgeManager.$(OBJEXT) -rm -f source/BridgeManager.$(OBJEXT)
-rm -f source/InterfaceManager.$(OBJEXT) -rm -f source/InterfaceManager.$(OBJEXT)
-rm -f source/PitData.$(OBJEXT)
-rm -f source/main.$(OBJEXT) -rm -f source/main.$(OBJEXT)


distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c


@AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/BridgeManager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/BridgeManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/InterfaceManager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/InterfaceManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/PitData.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@source/$(DEPDIR)/main.Po@am__quote@


.cpp.o: .cpp.o:
Expand Down Expand Up @@ -777,7 +784,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-udevrulesDATA




@LINUXTARGET_TRUE@install-data-hook: @LINUXTARGET_TRUE@install-data-hook:
@LINUXTARGET_TRUE@ sudo service udev reload @LINUXTARGET_TRUE@@UDEVADM_TRUE@ sudo udevadm control --reload_rules
@LINUXTARGET_TRUE@@UDEVADM_FALSE@ sudo service udev restart


# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
Expand Down
52 changes: 52 additions & 0 deletions heimdall/autom4te.cache/output.0
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -746,6 +746,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE am__EXEEXT_TRUE
LTLIBOBJS LTLIBOBJS
LIB@&t@OBJS LIB@&t@OBJS
UDEVADM_FALSE
UDEVADM_TRUE
LINUXTARGET_FALSE LINUXTARGET_FALSE
LINUXTARGET_TRUE LINUXTARGET_TRUE
MAINT MAINT
Expand Down Expand Up @@ -829,6 +831,7 @@ build_os
build_vendor build_vendor
build_cpu build_cpu
build build
udevadminstalled
DEPS_LIBS DEPS_LIBS
DEPS_CFLAGS DEPS_CFLAGS
PKG_CONFIG_LIBDIR PKG_CONFIG_LIBDIR
Expand Down Expand Up @@ -2583,6 +2586,43 @@ else
$as_echo "yes" >&6; } $as_echo "yes" >&6; }


fi fi
# Extract the first word of "udevadm", so it can be a program name with args.
set dummy udevadm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_udevadminstalled+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$udevadminstalled"; then
ac_cv_prog_udevadminstalled="$udevadminstalled" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
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=""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS

fi
fi
udevadminstalled=$ac_cv_prog_udevadminstalled
if test -n "$udevadminstalled"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $udevadminstalled" >&5
$as_echo "$udevadminstalled" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi


ac_aux_dir= ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then if test -f "$ac_dir/install-sh"; then
Expand Down Expand Up @@ -14561,6 +14601,14 @@ else
LINUXTARGET_FALSE= LINUXTARGET_FALSE=
fi fi


if test x$udevadmninstalled = xtrue; then
UDEVADM_TRUE=
UDEVADM_FALSE='#'
else
UDEVADM_TRUE='#'
UDEVADM_FALSE=
fi



{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; } $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
Expand Down Expand Up @@ -14917,6 +14965,10 @@ if test -z "${LINUXTARGET_TRUE}" && test -z "${LINUXTARGET_FALSE}"; then
as_fn_error $? "conditional \"LINUXTARGET\" was never defined. as_fn_error $? "conditional \"LINUXTARGET\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${UDEVADM_TRUE}" && test -z "${UDEVADM_FALSE}"; then
as_fn_error $? "conditional \"UDEVADM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi




: ${CONFIG_STATUS=./config.status} : ${CONFIG_STATUS=./config.status}
Expand Down
52 changes: 52 additions & 0 deletions heimdall/autom4te.cache/output.1
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -746,6 +746,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE am__EXEEXT_TRUE
LTLIBOBJS LTLIBOBJS
LIB@&t@OBJS LIB@&t@OBJS
UDEVADM_FALSE
UDEVADM_TRUE
LINUXTARGET_FALSE LINUXTARGET_FALSE
LINUXTARGET_TRUE LINUXTARGET_TRUE
MAINT MAINT
Expand Down Expand Up @@ -829,6 +831,7 @@ build_os
build_vendor build_vendor
build_cpu build_cpu
build build
udevadminstalled
DEPS_LIBS DEPS_LIBS
DEPS_CFLAGS DEPS_CFLAGS
PKG_CONFIG_LIBDIR PKG_CONFIG_LIBDIR
Expand Down Expand Up @@ -2583,6 +2586,43 @@ else
$as_echo "yes" >&6; } $as_echo "yes" >&6; }


fi fi
# Extract the first word of "udevadm", so it can be a program name with args.
set dummy udevadm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_udevadminstalled+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$udevadminstalled"; then
ac_cv_prog_udevadminstalled="$udevadminstalled" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
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=""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS

fi
fi
udevadminstalled=$ac_cv_prog_udevadminstalled
if test -n "$udevadminstalled"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $udevadminstalled" >&5
$as_echo "$udevadminstalled" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi


ac_aux_dir= ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then if test -f "$ac_dir/install-sh"; then
Expand Down Expand Up @@ -14557,6 +14597,14 @@ else
LINUXTARGET_FALSE= LINUXTARGET_FALSE=
fi fi


if test x$udevadmninstalled = xtrue; then
UDEVADM_TRUE=
UDEVADM_FALSE='#'
else
UDEVADM_TRUE='#'
UDEVADM_FALSE=
fi



{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; } $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
Expand Down Expand Up @@ -14913,6 +14961,10 @@ if test -z "${LINUXTARGET_TRUE}" && test -z "${LINUXTARGET_FALSE}"; then
as_fn_error $? "conditional \"LINUXTARGET\" was never defined. as_fn_error $? "conditional \"LINUXTARGET\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${UDEVADM_TRUE}" && test -z "${UDEVADM_FALSE}"; then
as_fn_error $? "conditional \"UDEVADM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi




: ${CONFIG_STATUS=./config.status} : ${CONFIG_STATUS=./config.status}
Expand Down
Loading

0 comments on commit 1e28948

Please sign in to comment.