[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-461-g6e69039
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-461-g6e69039
|
From: Julien B a. A. <ar...@us...> - 2010-06-18 10:06:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6e69039ec53b91304d1a2853fd4b5a24397094e5 (commit)
via a1265e02b3919f4e11f818814a797a9a4dbae5b5 (commit)
via 0d93c6c895e1a110c9ed561e88b4f46b044cd569 (commit)
via 046c39d8543bd554f858d56238507f5aab3b21e2 (commit)
from 7fac98dbb4d0fab25ee668c0a4f667f913082d2b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6e69039ec53b91304d1a2853fd4b5a24397094e5
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 12:04:44 2010 +0200
[BUILDROOT] move package/slideshow as patch against BR
commit a1265e02b3919f4e11f818814a797a9a4dbae5b5
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 11:07:26 2010 +0200
[BUILDROOT] Put sdl modifications as patch against BR
commit 0d93c6c895e1a110c9ed561e88b4f46b044cd569
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 10:58:39 2010 +0200
[BUILDROOT] Put openssh modifications as patch against BR
commit 046c39d8543bd554f858d56238507f5aab3b21e2
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 10:42:32 2010 +0200
[BUILDROOT] unversion package/audio/
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 4 -
buildroot/package/audio/.gitignore | 3 -
buildroot/package/openssh/.gitignore | 5 -
.../package/openssh/openssh.passwdexpire.patch | 13 --
buildroot/package/sdl/.gitignore | 2 -
.../sdl/sdl-1.2.11-z-sdl-config-paths.patch | 15 --
buildroot/package/slideshow/Config.in | 10 -
.../slideshow-01-add-arm-cross-compile.patch | 25 ---
.../slideshow/slideshow-02-restart-after-end.patch | 73 --------
.../slideshow-03-remove-compile-warning.patch | 13 --
buildroot/package/slideshow/slideshow.mk | 49 ------
patches/buildroot/034-slideshow.patch | 174 +++++++++++++++++++-
.../buildroot/045-openssh-add_passwd_expire.patch | 18 ++
...078-sdl-add_patch_for_paths_in_sdl_config.patch | 20 +++
patches/buildroot/2010.05/034-slideshow.patch | 170 +++++++++++++++++++
.../2010.05/045-openssh-add_passwd_expire.patch | 18 ++
...078-sdl-add_patch_for_paths_in_sdl_config.patch | 20 +++
patches/buildroot/2010.05/cleanup_buildroot.sh | 3 +
patches/buildroot/cleanup_buildroot.sh | 3 +
19 files changed, 424 insertions(+), 214 deletions(-)
delete mode 100644 buildroot/package/audio/.gitignore
delete mode 100644 buildroot/package/openssh/.gitignore
delete mode 100644 buildroot/package/openssh/openssh.passwdexpire.patch
delete mode 100644 buildroot/package/sdl/.gitignore
delete mode 100644 buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
delete mode 100644 buildroot/package/slideshow/Config.in
delete mode 100644 buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch
delete mode 100644 buildroot/package/slideshow/slideshow-02-restart-after-end.patch
delete mode 100644 buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch
delete mode 100644 buildroot/package/slideshow/slideshow.mk
create mode 100644 patches/buildroot/045-openssh-add_passwd_expire.patch
create mode 100644 patches/buildroot/078-sdl-add_patch_for_paths_in_sdl_config.patch
create mode 100644 patches/buildroot/2010.05/045-openssh-add_passwd_expire.patch
create mode 100644 patches/buildroot/2010.05/078-sdl-add_patch_for_paths_in_sdl_config.patch
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 273ed3c..489f220 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -11,19 +11,15 @@
# except:
!/allegro/
!/armadeus/
-!/audio/
!/bluez/
!/fbgrab/
!/fbtest/
!/lcd4linux/
!/mesa/
!/mtd/
-!/openssh/
!/pymysql/
!/pyserial/
-!/sdl/
!/sdlwater/
-!/slideshow/
!/snes9x/
!/socketcan/
!/xenomai/
diff --git a/buildroot/package/audio/.gitignore b/buildroot/package/audio/.gitignore
deleted file mode 100644
index 764b172..0000000
--- a/buildroot/package/audio/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*/
-/Config.in
-/audio.mk
diff --git a/buildroot/package/openssh/.gitignore b/buildroot/package/openssh/.gitignore
deleted file mode 100644
index cbd6fce..0000000
--- a/buildroot/package/openssh/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Config.in
-/S50sshd
-/openssh.002-SUSv-legacy.patch
-/openssh.mk
-/openssh.patch
diff --git a/buildroot/package/openssh/openssh.passwdexpire.patch b/buildroot/package/openssh/openssh.passwdexpire.patch
deleted file mode 100644
index fbd5f53..0000000
--- a/buildroot/package/openssh/openssh.passwdexpire.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- openssh-4.6p1/configure.ac.org 2007-10-21 12:42:09.000000000 +0200
-+++ openssh-4.6p1/configure.ac 2007-10-21 13:11:50.000000000 +0200
-@@ -3437,8 +3437,8 @@ if test -z "$disable_shadow" ; then
-
- if test "x$sp_expire_available" = "xyes" ; then
- AC_MSG_RESULT(yes)
-- AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
-- [Define if you want to use shadow password expire field])
-+// AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
-+// [Define if you want to use shadow password expire field])
- else
- AC_MSG_RESULT(no)
- fi
diff --git a/buildroot/package/sdl/.gitignore b/buildroot/package/sdl/.gitignore
deleted file mode 100644
index 2d6cc8b..0000000
--- a/buildroot/package/sdl/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Config.in
-/sdl.mk
diff --git a/buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch b/buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
deleted file mode 100644
index e7537ab..0000000
--- a/buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- SDL-1.2.11.org/sdl-config.in 2007-11-17 16:43:59.000000000 +0100
-+++ SDL-1.2.11/sdl-config.in 2007-11-17 16:45:31.000000000 +0100
-@@ -41,10 +41,10 @@
- echo @SDL_VERSION@
- ;;
- --cflags)
-- echo -I@includedir@/SDL @SDL_CFLAGS@
-+ echo -I$STAGING_DIR/include/SDL @SDL_CFLAGS@
- ;;
- @ENABLE_SHARED_TRUE@ --libs)
--@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@ echo -L$STAGING_DIR/lib @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@ ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
diff --git a/buildroot/package/slideshow/Config.in b/buildroot/package/slideshow/Config.in
deleted file mode 100644
index a3dfdab..0000000
--- a/buildroot/package/slideshow/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_SLIDESHOW
- bool "Slideshow"
- depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
- default n
- help
-
- Perigee Slideshow is a command line program that searches a directory
- for supported graphic files and displays them in a slideshow.
-
- http://www.xmission.com/~jstanley/slideshow.html
diff --git a/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch b/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch
deleted file mode 100644
index 9537bf3..0000000
--- a/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- slideshow/Makefile 2003-11-29 21:08:54.000000000 +0100
-+++ slideshow.mod/Makefile 2007-09-05 12:08:56.000000000 +0200
-@@ -1,6 +1,11 @@
-+ifeq ($(ARCH), arm)
-+CFLAGS = -O2 `sh ../SDL-1.2.13/sdl-config --cflags`
-+LFLAGS = `sh ../SDL-1.2.13/sdl-config --libs` -lSDL_image
-+else
- CFLAGS = -O2 -march=i586 `sdl-config --cflags`
- LFLAGS = `sdl-config --libs` -lSDL_image
- CC = g++
-+endif
- EXE = slideshow
- OBJ = file_list.o fontdata.o main.o SDLFont.o slideshow.o
-
---- slideshow/SDLFont.h 2003-11-29 21:08:54.000000000 +0100
-+++ slideshow.mod/SDLFont.h 2007-09-05 12:11:17.000000000 +0200
-@@ -34,7 +34,7 @@
- // The value of the top-left pixel in the font bitmap will be
- // considered transparent. Anything else is opaque.
-
--#include <SDL/SDL.h>
-+#include "SDL.h"
-
- class SDLFont
- {
diff --git a/buildroot/package/slideshow/slideshow-02-restart-after-end.patch b/buildroot/package/slideshow/slideshow-02-restart-after-end.patch
deleted file mode 100644
index c5840a6..0000000
--- a/buildroot/package/slideshow/slideshow-02-restart-after-end.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
-+++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
-@@ -196,43 +196,48 @@
- SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
- SDL_UpdateRects(m_sdl, 1, &rc);
- }
--
-- user_command cmd = wait_for_command();
--
-+
-+ user_command cmd = wait_for_command();
-+
- switch(cmd)
-- {
-- case c_quit:
-- stop_timer();
-- return true;
-- case c_first_slide:
-+ {
-+ case c_quit:
-+ stop_timer();
-+ return true;
-+ case c_first_slide:
- stop_timer();
- m_image_index = 0;
- break;
- case c_last_slide:
-- stop_timer();
-+ stop_timer();
- m_image_index = m_file_list->count() - 1;
-- break;
-+ break;
- case c_prev_slide:
-- stop_timer();
-+ stop_timer();
- if ( m_image_index > 0 )
- m_image_index--;
- break;
- case c_next_slide:
-- stop_timer();
-- // fall through
-- case c_timer_advance:
-- if ( m_image_index < m_file_list->count() - 1 )
-+ stop_timer();
-+ // fall through
-+ case c_timer_advance:
-+ if ( m_image_index <= m_file_list->count() - 1 )
- m_image_index++;
-- break;
-- case c_redraw:
- break;
-- }
-+ case c_redraw:
-+ break;
-+ }
-
- // stop the auto-advance when the last picture is about to be shown
-- if ( m_image_index == m_file_list->count() - 1 )
-- stop_timer();
-- }
--
-+ if ( m_image_index == m_file_list->count() /*- 1*/ )
-+ {
-+ //stop_timer();
-+ m_image_index = 0;
-+ m_prev_image_index = -1;
-+ }
-+
-+ }
-+
- return true;
- }
-
diff --git a/buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch b/buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch
deleted file mode 100644
index 9de2625..0000000
--- a/buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
-+++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
-@@ -84,8 +84,8 @@
-
- Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
- Uint8 *pChar, *pScreen;
-- char c;
-- int i, j;
-+ //char c;
-+ int i, j, c;
-
- for(const char *p = text; *p != '\0'; p++)
- {
diff --git a/buildroot/package/slideshow/slideshow.mk b/buildroot/package/slideshow/slideshow.mk
deleted file mode 100644
index bb5a5e4..0000000
--- a/buildroot/package/slideshow/slideshow.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#############################################################
-#
-# Slideshow
-#
-#############################################################
-SLIDESHOW_VERSION:=1.1
-SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
-SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
-SLIDESHOW_CAT:=zcat
-SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow
-
-$(DL_DIR)/$(SLIDESHOW_SOURCE):
- $(WGET) -P $(DL_DIR) $(SLIDESHOW_SITE)/$(SLIDESHOW_SOURCE)
-
-slideshow-source: $(DL_DIR)/$(SLIDESHOW_SOURCE)
-
-$(SLIDESHOW_DIR)/.unpacked: $(DL_DIR)/$(SLIDESHOW_SOURCE)
- unzip $(DL_DIR)/$(SLIDESHOW_SOURCE) -d $(BUILD_DIR)
- touch $@
-
-$(SLIDESHOW_DIR)/.configured: $(SLIDESHOW_DIR)/.unpacked
- echo "Patching...."
- toolchain/patch-kernel.sh $(SLIDESHOW_DIR) package/slideshow/ slideshow-\*.patch
- touch $@
-
-$(SLIDESHOW_DIR)/slideshow: $(SLIDESHOW_DIR)/.configured
- export CC=$(TARGET_CXX); export STAGING_DIR=$(STAGING_DIR); $(MAKE) -C $(SLIDESHOW_DIR) ARCH=arm
-
-$(TARGET_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/slideshow
- cp -dpf $< $(TARGET_DIR)/usr/bin
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-
-SLIDESHOW slideshow: sdl sdl_image $(TARGET_DIR)/usr/bin/slideshow
-
-slideshow-clean:
- rm -f $(TARGET_DIR)/usr/bin/slideshow
- -$(MAKE) -C $(SLIDESHOW_DIR) clean
-
-slideshow-dirclean:
- rm -rf $(SLIDESHOW_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_SLIDESHOW)),y)
-TARGETS+=slideshow
-endif
diff --git a/patches/buildroot/034-slideshow.patch b/patches/buildroot/034-slideshow.patch
index 1f01072..9124014 100644
--- a/patches/buildroot/034-slideshow.patch
+++ b/patches/buildroot/034-slideshow.patch
@@ -1,7 +1,11 @@
+Add slideshow package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-01-25 10:04:10.000000000 +0100
-+++ buildroot/package/Config.in 2010-01-25 10:04:25.000000000 +0100
+--- buildroot.orig/package/Config.in 2010-06-18 11:17:54.000000000 +0200
++++ buildroot/package/Config.in 2010-06-18 11:27:14.000000000 +0200
@@ -329,6 +329,7 @@
source "package/sdl_mixer/Config.in"
source "package/sdl_net/Config.in"
@@ -10,3 +14,169 @@ Index: buildroot/package/Config.in
source "package/tiff/Config.in"
comment "Demos"
source "package/sdlwater/Config.in"
+Index: buildroot/package/slideshow/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/Config.in 2010-06-18 11:33:25.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_SLIDESHOW
++ bool "Slideshow"
++ depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
++ help
++
++ Perigee Slideshow is a command line program that searches a directory
++ for supported graphic files and displays them in a slideshow.
++
++ http://www.xmission.com/~jstanley/slideshow.html
+Index: buildroot/package/slideshow/slideshow.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow.mk 2010-06-18 11:48:12.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
++#
++# slideshow
++#
++#############################################################
++SLIDESHOW_VERSION:=1.1
++SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
++SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
++SLIDESHOW_CAT:=zcat
++SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow
++
++$(DL_DIR)/$(SLIDESHOW_SOURCE):
++ $(WGET) -P $(DL_DIR) $(SLIDESHOW_SITE)/$(SLIDESHOW_SOURCE)
++
++slideshow-source: $(DL_DIR)/$(SLIDESHOW_SOURCE)
++
++$(SLIDESHOW_DIR)/.unpacked: $(DL_DIR)/$(SLIDESHOW_SOURCE)
++ unzip $(DL_DIR)/$(SLIDESHOW_SOURCE) -d $(BUILD_DIR)
++ touch $@
++
++$(SLIDESHOW_DIR)/.configured: $(SLIDESHOW_DIR)/.unpacked
++ @echo "Patching slideshow..."
++ toolchain/patch-kernel.sh $(SLIDESHOW_DIR) package/slideshow/ slideshow-\*.patch
++ touch $@
++
++$(SLIDESHOW_DIR)/slideshow: $(SLIDESHOW_DIR)/.configured
++ $(MAKE) CC=$(TARGET_CXX) CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
++ LFLAGS="`sh $(STAGING_DIR)/usr/bin/sdl-config --libs` -lSDL_image" \
++ -C $(SLIDESHOW_DIR)
++
++$(TARGET_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/slideshow
++ cp -dpf $< $(TARGET_DIR)/usr/bin
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
++
++SLIDESHOW slideshow: sdl sdl_image $(TARGET_DIR)/usr/bin/slideshow
++
++slideshow-clean:
++ rm -f $(TARGET_DIR)/usr/bin/slideshow
++ -$(MAKE) -C $(SLIDESHOW_DIR) clean
++
++slideshow-dirclean:
++ rm -rf $(SLIDESHOW_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_SLIDESHOW)),y)
++TARGETS+=slideshow
++endif
+Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2010-06-18 11:50:12.000000000 +0200
+@@ -0,0 +1,73 @@
++--- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
+++++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
++@@ -196,43 +196,48 @@
++ SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
++ SDL_UpdateRects(m_sdl, 1, &rc);
++ }
++-
++- user_command cmd = wait_for_command();
++-
+++
+++ user_command cmd = wait_for_command();
+++
++ switch(cmd)
++- {
++- case c_quit:
++- stop_timer();
++- return true;
++- case c_first_slide:
+++ {
+++ case c_quit:
+++ stop_timer();
+++ return true;
+++ case c_first_slide:
++ stop_timer();
++ m_image_index = 0;
++ break;
++ case c_last_slide:
++- stop_timer();
+++ stop_timer();
++ m_image_index = m_file_list->count() - 1;
++- break;
+++ break;
++ case c_prev_slide:
++- stop_timer();
+++ stop_timer();
++ if ( m_image_index > 0 )
++ m_image_index--;
++ break;
++ case c_next_slide:
++- stop_timer();
++- // fall through
++- case c_timer_advance:
++- if ( m_image_index < m_file_list->count() - 1 )
+++ stop_timer();
+++ // fall through
+++ case c_timer_advance:
+++ if ( m_image_index <= m_file_list->count() - 1 )
++ m_image_index++;
++- break;
++- case c_redraw:
++ break;
++- }
+++ case c_redraw:
+++ break;
+++ }
++
++ // stop the auto-advance when the last picture is about to be shown
++- if ( m_image_index == m_file_list->count() - 1 )
++- stop_timer();
++- }
++-
+++ if ( m_image_index == m_file_list->count() /*- 1*/ )
+++ {
+++ //stop_timer();
+++ m_image_index = 0;
+++ m_prev_image_index = -1;
+++ }
+++
+++ }
+++
++ return true;
++ }
++
+Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2010-06-18 11:50:59.000000000 +0200
+@@ -0,0 +1,13 @@
++--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
+++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
++@@ -84,8 +84,8 @@
++
++ Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
++ Uint8 *pChar, *pScreen;
++- char c;
++- int i, j;
+++ //char c;
+++ int i, j, c;
++
++ for(const char *p = text; *p != '\0'; p++)
++ {
diff --git a/patches/buildroot/045-openssh-add_passwd_expire.patch b/patches/buildroot/045-openssh-add_passwd_expire.patch
new file mode 100644
index 0000000..b7908ca
--- /dev/null
+++ b/patches/buildroot/045-openssh-add_passwd_expire.patch
@@ -0,0 +1,18 @@
+Index: buildroot/package/openssh/openssh.passwdexpire.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openssh/openssh.passwdexpire.patch 2010-06-18 10:54:52.000000000 +0200
+@@ -0,0 +1,13 @@
++--- openssh-4.6p1/configure.ac.org 2007-10-21 12:42:09.000000000 +0200
+++++ openssh-4.6p1/configure.ac 2007-10-21 13:11:50.000000000 +0200
++@@ -3437,8 +3437,8 @@ if test -z "$disable_shadow" ; then
++
++ if test "x$sp_expire_available" = "xyes" ; then
++ AC_MSG_RESULT(yes)
++- AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
++- [Define if you want to use shadow password expire field])
+++// AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
+++// [Define if you want to use shadow password expire field])
++ else
++ AC_MSG_RESULT(no)
++ fi
diff --git a/patches/buildroot/078-sdl-add_patch_for_paths_in_sdl_config.patch b/patches/buildroot/078-sdl-add_patch_for_paths_in_sdl_config.patch
new file mode 100644
index 0000000..33f8b66
--- /dev/null
+++ b/patches/buildroot/078-sdl-add_patch_for_paths_in_sdl_config.patch
@@ -0,0 +1,20 @@
+Index: buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch 2010-06-18 11:04:32.000000000 +0200
+@@ -0,0 +1,15 @@
++--- SDL-1.2.11.org/sdl-config.in 2007-11-17 16:43:59.000000000 +0100
+++++ SDL-1.2.11/sdl-config.in 2007-11-17 16:45:31.000000000 +0100
++@@ -41,10 +41,10 @@
++ echo @SDL_VERSION@
++ ;;
++ --cflags)
++- echo -I@includedir@/SDL @SDL_CFLAGS@
+++ echo -I$STAGING_DIR/include/SDL @SDL_CFLAGS@
++ ;;
++ @ENABLE_SHARED_TRUE@ --libs)
++-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+++@ENABLE_SHARED_TRUE@ echo -L$STAGING_DIR/lib @SDL_RLD_FLAGS@ @SDL_LIBS@
++ @ENABLE_SHARED_TRUE@ ;;
++ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
++ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
diff --git a/patches/buildroot/2010.05/034-slideshow.patch b/patches/buildroot/2010.05/034-slideshow.patch
index 9f69ddb..6031287 100644
--- a/patches/buildroot/2010.05/034-slideshow.patch
+++ b/patches/buildroot/2010.05/034-slideshow.patch
@@ -1,3 +1,7 @@
+Add slideshow package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-17 16:46:13.000000000 +0200
@@ -10,3 +14,169 @@ Index: buildroot/package/Config.in
comment "Demos"
source "package/sdlwater/Config.in"
+Index: buildroot/package/slideshow/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/Config.in 2010-06-18 11:33:25.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_SLIDESHOW
++ bool "Slideshow"
++ depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
++ help
++
++ Perigee Slideshow is a command line program that searches a directory
++ for supported graphic files and displays them in a slideshow.
++
++ http://www.xmission.com/~jstanley/slideshow.html
+Index: buildroot/package/slideshow/slideshow.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow.mk 2010-06-18 11:48:12.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
++#
++# slideshow
++#
++#############################################################
++SLIDESHOW_VERSION:=1.1
++SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
++SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
++SLIDESHOW_CAT:=zcat
++SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow
++
++$(DL_DIR)/$(SLIDESHOW_SOURCE):
++ $(WGET) -P $(DL_DIR) $(SLIDESHOW_SITE)/$(SLIDESHOW_SOURCE)
++
++slideshow-source: $(DL_DIR)/$(SLIDESHOW_SOURCE)
++
++$(SLIDESHOW_DIR)/.unpacked: $(DL_DIR)/$(SLIDESHOW_SOURCE)
++ unzip $(DL_DIR)/$(SLIDESHOW_SOURCE) -d $(BUILD_DIR)
++ touch $@
++
++$(SLIDESHOW_DIR)/.configured: $(SLIDESHOW_DIR)/.unpacked
++ @echo "Patching slideshow..."
++ toolchain/patch-kernel.sh $(SLIDESHOW_DIR) package/slideshow/ slideshow-\*.patch
++ touch $@
++
++$(SLIDESHOW_DIR)/slideshow: $(SLIDESHOW_DIR)/.configured
++ $(MAKE) CC=$(TARGET_CXX) CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
++ LFLAGS="`sh $(STAGING_DIR)/usr/bin/sdl-config --libs` -lSDL_image" \
++ -C $(SLIDESHOW_DIR)
++
++$(TARGET_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/slideshow
++ cp -dpf $< $(TARGET_DIR)/usr/bin
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
++
++SLIDESHOW slideshow: sdl sdl_image $(TARGET_DIR)/usr/bin/slideshow
++
++slideshow-clean:
++ rm -f $(TARGET_DIR)/usr/bin/slideshow
++ -$(MAKE) -C $(SLIDESHOW_DIR) clean
++
++slideshow-dirclean:
++ rm -rf $(SLIDESHOW_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_SLIDESHOW)),y)
++TARGETS+=slideshow
++endif
+Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2010-06-18 11:50:12.000000000 +0200
+@@ -0,0 +1,73 @@
++--- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
+++++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
++@@ -196,43 +196,48 @@
++ SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
++ SDL_UpdateRects(m_sdl, 1, &rc);
++ }
++-
++- user_command cmd = wait_for_command();
++-
+++
+++ user_command cmd = wait_for_command();
+++
++ switch(cmd)
++- {
++- case c_quit:
++- stop_timer();
++- return true;
++- case c_first_slide:
+++ {
+++ case c_quit:
+++ stop_timer();
+++ return true;
+++ case c_first_slide:
++ stop_timer();
++ m_image_index = 0;
++ break;
++ case c_last_slide:
++- stop_timer();
+++ stop_timer();
++ m_image_index = m_file_list->count() - 1;
++- break;
+++ break;
++ case c_prev_slide:
++- stop_timer();
+++ stop_timer();
++ if ( m_image_index > 0 )
++ m_image_index--;
++ break;
++ case c_next_slide:
++- stop_timer();
++- // fall through
++- case c_timer_advance:
++- if ( m_image_index < m_file_list->count() - 1 )
+++ stop_timer();
+++ // fall through
+++ case c_timer_advance:
+++ if ( m_image_index <= m_file_list->count() - 1 )
++ m_image_index++;
++- break;
++- case c_redraw:
++ break;
++- }
+++ case c_redraw:
+++ break;
+++ }
++
++ // stop the auto-advance when the last picture is about to be shown
++- if ( m_image_index == m_file_list->count() - 1 )
++- stop_timer();
++- }
++-
+++ if ( m_image_index == m_file_list->count() /*- 1*/ )
+++ {
+++ //stop_timer();
+++ m_image_index = 0;
+++ m_prev_image_index = -1;
+++ }
+++
+++ }
+++
++ return true;
++ }
++
+Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2010-06-18 11:50:59.000000000 +0200
+@@ -0,0 +1,13 @@
++--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
+++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
++@@ -84,8 +84,8 @@
++
++ Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
++ Uint8 *pChar, *pScreen;
++- char c;
++- int i, j;
+++ //char c;
+++ int i, j, c;
++
++ for(const char *p = text; *p != '\0'; p++)
++ {
diff --git a/patches/buildroot/2010.05/045-openssh-add_passwd_expire.patch b/patches/buildroot/2010.05/045-openssh-add_passwd_expire.patch
new file mode 100644
index 0000000..b7908ca
--- /dev/null
+++ b/patches/buildroot/2010.05/045-openssh-add_passwd_expire.patch
@@ -0,0 +1,18 @@
+Index: buildroot/package/openssh/openssh.passwdexpire.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openssh/openssh.passwdexpire.patch 2010-06-18 10:54:52.000000000 +0200
+@@ -0,0 +1,13 @@
++--- openssh-4.6p1/configure.ac.org 2007-10-21 12:42:09.000000000 +0200
+++++ openssh-4.6p1/configure.ac 2007-10-21 13:11:50.000000000 +0200
++@@ -3437,8 +3437,8 @@ if test -z "$disable_shadow" ; then
++
++ if test "x$sp_expire_available" = "xyes" ; then
++ AC_MSG_RESULT(yes)
++- AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
++- [Define if you want to use shadow password expire field])
+++// AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
+++// [Define if you want to use shadow password expire field])
++ else
++ AC_MSG_RESULT(no)
++ fi
diff --git a/patches/buildroot/2010.05/078-sdl-add_patch_for_paths_in_sdl_config.patch b/patches/buildroot/2010.05/078-sdl-add_patch_for_paths_in_sdl_config.patch
new file mode 100644
index 0000000..33f8b66
--- /dev/null
+++ b/patches/buildroot/2010.05/078-sdl-add_patch_for_paths_in_sdl_config.patch
@@ -0,0 +1,20 @@
+Index: buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch 2010-06-18 11:04:32.000000000 +0200
+@@ -0,0 +1,15 @@
++--- SDL-1.2.11.org/sdl-config.in 2007-11-17 16:43:59.000000000 +0100
+++++ SDL-1.2.11/sdl-config.in 2007-11-17 16:45:31.000000000 +0100
++@@ -41,10 +41,10 @@
++ echo @SDL_VERSION@
++ ;;
++ --cflags)
++- echo -I@includedir@/SDL @SDL_CFLAGS@
+++ echo -I$STAGING_DIR/include/SDL @SDL_CFLAGS@
++ ;;
++ @ENABLE_SHARED_TRUE@ --libs)
++-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+++@ENABLE_SHARED_TRUE@ echo -L$STAGING_DIR/lib @SDL_RLD_FLAGS@ @SDL_LIBS@
++ @ENABLE_SHARED_TRUE@ ;;
++ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
++ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index b122322..3e7051f 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -25,3 +25,6 @@ rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
rm -rf buildroot/package/lmbench/
rm -rf buildroot/package/tslib/
+rm -rf buildroot/package/openssh/
+rm -rf buildroot/package/sdl/
+rm -rf buildroot/package/slideshow/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 1c02a92..63719ab 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -29,3 +29,6 @@ rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
rm -rf buildroot/package/lmbench/
rm -rf buildroot/package/tslib/
+rm -rf buildroot/package/openssh/
+rm -rf buildroot/package/sdl/
+rm -rf buildroot/package/slideshow/
hooks/post-receive
--
armadeus
|
