Skip to content

Commit

Permalink
* 7170: Add new (04.76) kernel source, reactivate replace kernel (ref…
Browse files Browse the repository at this point in the history
…s #499)

git-svn-id: file:///var/svn/freetz/trunk@3518 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information
markuschen committed Jul 30, 2009
1 parent 1db6170 commit bd1fa70
Show file tree
Hide file tree
Showing 12 changed files with 1,503 additions and 24 deletions.
3 changes: 1 addition & 2 deletions Config.in
Expand Up @@ -427,8 +427,7 @@ config FREETZ_REPLACE_BUSYBOX
config FREETZ_REPLACE_KERNEL_AVAILABLE
bool
depends on \
! FREETZ_TYPE_FON_WLAN_7170 && \
!( (FREETZ_TYPE_FON_WLAN_7240 || FREETZ_TYPE_FON_WLAN_7270) && FREETZ_TYPE_LABOR_PHONE) && \
! ((FREETZ_TYPE_FON_WLAN_7240 || FREETZ_TYPE_FON_WLAN_7270) && FREETZ_TYPE_LABOR_PHONE) && \
! (FREETZ_TYPE_FON && FREETZ_TYPE_LANG_EN)
default y

Expand Down
6 changes: 6 additions & 0 deletions make/avm-gpl/avm-gpl.mk
@@ -1,5 +1,6 @@
AVM_SITE__AVM:=ftp://ftp.avm.de/develper/opensrc
AVM_SITE__AVM_7270:=ftp://ftp.avm.de/fritz.box/fritzbox.fon_wlan_7270/x_misc/opensrc
AVM_SITE__AVM_7170:=ftp://ftp.avm.de/fritz.box/fritzbox.fon_wlan_7170/x_misc/opensrc
AVM_SITE__TCOM:=http://www.t-home.de/dlp/eki/downloads/Speedport

AVM_SOURCE__04.29:=$(AVM_SITE__AVM)/fritzbox-source-files-04.29.tar.bz2
Expand All @@ -10,6 +11,7 @@ AVM_SOURCE__04.49:=$(AVM_SITE__AVM)/fritzbox-source-files-04.49.tar.gz
AVM_SOURCE__04.57:=$(AVM_SITE__AVM)/fritzbox-source-files.04.57.tar.gz
AVM_SOURCE__04.67:=$(AVM_SITE__AVM)/fritzbox-source-files.04.67.tar.gz
AVM_SOURCE__04.70:=$(AVM_SITE__AVM)/fritzbox-source-files-04.70.tar.gz
AVM_SOURCE__04.76:=$(AVM_SITE__AVM_7170)/fritzbox7170-source-files-04.76.tar.gz
AVM_SOURCE__7270:=$(AVM_SITE__AVM)/fritzbox7270-source-files-04-57.tar.gz
AVM_SOURCE__12043:=$(AVM_SITE__AVM)/fritzbox-lab-source-files-12043.tar.gz
AVM_SOURCE__7270_04.67:=$(AVM_SITE__AVM)/fritzbox7270-source-files-04.67.tar.gz
Expand Down Expand Up @@ -50,6 +52,10 @@ ifeq ($(AVM_VERSION),04.70)
mkdir -p $(AVM_DIR)/GPL/base/kernel
tar -C $(AVM_DIR)/GPL/base/kernel $(VERBOSE) -xzf $(AVM_DIR)/GPL/GPL-release_kernel.tar.gz
endif
ifeq ($(AVM_VERSION),04.76)
mkdir -p $(AVM_DIR)/GPL/base/kernel
tar -C $(AVM_DIR)/GPL/base/kernel $(VERBOSE) -xzf $(AVM_DIR)/GPL/GPL-release_kernel.tar.gz
endif
ifeq ($(AVM_VERSION),7270)
mkdir -p $(AVM_DIR)/GPL/base/kernel
tar -C $(AVM_DIR)/GPL/base/kernel $(VERBOSE) -xzf $(AVM_DIR)/GPL/GPL-release_kernel.tar.gz
Expand Down
14 changes: 7 additions & 7 deletions make/libs/patches/100-libdir-la.freetype.patch
@@ -1,6 +1,6 @@
--- builds/unix/ltmain.sh.orig 2006-04-20 08:27:27.000000000 -0600
+++ builds/unix/ltmain.sh 2007-01-13 14:26:01.000000000 -0700
@@ -273,8 +273,9 @@
--- builds/unix/ltmain.sh.orig 2007-06-30 07:30:59.000000000 +0200
+++ builds/unix/ltmain.sh 2009-07-30 23:22:33.000000000 +0200
@@ -291,8 +291,9 @@
# line option must be used.
if test -z "$tagname"; then
$echo "$modename: unable to infer tagged configuration"
Expand All @@ -12,7 +12,7 @@
# else
# $echo "$modename: using $tagname tagged configuration"
fi
@@ -2404,8 +2405,14 @@
@@ -2444,8 +2445,14 @@
absdir="$abs_ladir"
libdir="$abs_ladir"
else
Expand All @@ -29,7 +29,7 @@
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
@@ -2886,6 +2893,16 @@
@@ -2928,6 +2935,16 @@
esac
if grep "^installed=no" $deplib > /dev/null; then
path="$absdir/$objdir"
Expand All @@ -46,7 +46,7 @@
else
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then
@@ -5598,6 +5615,10 @@
@@ -5661,6 +5678,10 @@
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
Expand All @@ -57,7 +57,7 @@
case $deplib in
*.la)
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
@@ -5919,10 +5940,13 @@
@@ -5982,10 +6003,13 @@
# At present, this check doesn't affect windows .dll's that
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
Expand Down
6 changes: 3 additions & 3 deletions make/libs/patches/100-stat_wav.pjproject.patch
@@ -1,6 +1,6 @@
--- pjlib/src/pj/file_access_unistd.c.orig 2008-12-25 17:28:01.000000000 +0100
+++ pjlib/src/pj/file_access_unistd.c 2008-12-25 17:33:19.000000000 +0100
@@ -48,11 +48,17 @@
--- pjlib/src/pj/file_access_unistd.c.orig 2008-12-23 18:27:53.000000000 +0100
+++ pjlib/src/pj/file_access_unistd.c 2009-07-30 23:54:05.000000000 +0200
@@ -49,11 +49,17 @@
PJ_DEF(pj_off_t) pj_file_size(const char *filename)
{
struct stat buf;
Expand Down
12 changes: 6 additions & 6 deletions make/libs/patches/120-no_uuid.pjproject.patch
@@ -1,6 +1,6 @@
--- aconfigure.orig 2008-07-19 18:24:30.000000000 +0200
+++ aconfigure 2008-07-19 18:31:12.000000000 +0200
@@ -3351,149 +3351,6 @@
--- aconfigure.orig 2008-09-27 15:16:35.000000000 +0200
+++ aconfigure 2009-07-30 23:54:05.000000000 +0200
@@ -3360,149 +3360,6 @@

fi

Expand Down Expand Up @@ -150,7 +150,7 @@
echo "$as_me:$LINENO: result: Setting PJ_M_NAME to $target_cpu" >&5
echo "${ECHO_T}Setting PJ_M_NAME to $target_cpu" >&6
cat >>confdefs.h <<_ACEOF
@@ -8662,149 +8519,6 @@
@@ -8875,149 +8732,6 @@

fi

Expand Down Expand Up @@ -300,9 +300,9 @@
echo "$as_me:$LINENO: checking for net/if.h" >&5
echo $ECHO_N "checking for net/if.h... $ECHO_C" >&6
if test "${ac_cv_header_net_if_h+set}" = set; then
@@ -9551,11 +9265,7 @@
@@ -9783,11 +9497,7 @@
*)
ac_os_objs="file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o ioqueue_select.o"
ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o"
# UUID
- if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
- ac_os_objs="$ac_os_objs guid_uuid.o"
Expand Down

0 comments on commit bd1fa70

Please sign in to comment.