[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-488-g957ad91
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-488-g957ad91
|
From: Sébastien S. <ss...@us...> - 2014-11-20 10:44:30
|
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 957ad91c4e6741b478d150c8d3cdbcc4f22bb345 (commit)
from 38f996bd146eb83dfc5bd37197fd5b4258a071c1 (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 957ad91c4e6741b478d150c8d3cdbcc4f22bb345
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Nov 20 11:31:08 2014 +0100
[BUILDROOT] Update cleanup_buildroot.sh and update it automatically.
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2013.11/cleanup_buildroot.sh | 260 ++++++++++++++++--------
scripts/quiltify.sh | 24 ++-
2 files changed, 192 insertions(+), 92 deletions(-)
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index e7787ea..4957742 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -1,94 +1,174 @@
#!/bin/bash
-#
-# Things to do before patching Buildroot
-#
-# Removes packages/files added through patches:
-rm -rf buildroot/package/beremiz
-rm -rf buildroot/boot/uboot/
-rm -rf buildroot/package/quake-pak/
-rm -rf buildroot/package/sdlquake/
-rm -rf buildroot/package/gpm/
-rm -rf buildroot/package/python-pygame/
-rm -rf buildroot/package/python-pyro/
-rm -rf buildroot/package/uucp/
-rm -rf buildroot/package/matiec/
-rm -f buildroot/package/libsndfile/libsndfile-1.0.*-srconly.patch
-rm -rf buildroot/package/flite/
-rm -rf buildroot/package/libcurl/
-rm -f buildroot/package/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
-rm -f buildroot/package/madplay/madplay-audio-alsa.patch
-rm -rf buildroot/package/wolf4sdl/
-rm -rf buildroot/package/lmbench/
-rm -rf buildroot/package/tslib/
-rm -rf buildroot/package/openssh/
-rm -rf buildroot/package/qtcreator
-rm -rf buildroot/package/sdl/
-rm -rf buildroot/package/sdl_water/
-rm -rf buildroot/package/slideshow/
-rm -rf buildroot/package/python-crc16/
-rm -rf buildroot/package/socketcan/
-rm -rf buildroot/package/lcd4linux/
-rm -rf buildroot/package/mesa/
-rm -rf buildroot/package/snes9x/
-rm -rf buildroot/package/allegro/
-rm -rf buildroot/package/fbgrab/
-rm -rf buildroot/package/fbtest/
-rm -rf buildroot/package/xenomai/
-rm -rf buildroot/package/cwiid/
-rm -rf buildroot/package/urg/
-rm -rf buildroot/package/pywebradio/
-rm -rf buildroot/package/e-uae/
-rm -rf buildroot/package/opentyrian/
-rm -rf buildroot/package/ipsec-tools/
-rm -rf buildroot/package/java/
-rm -rf buildroot/package/lbreakout2/
-rm -rf buildroot/package/ltris/
-rm -rf buildroot/package/qwt/
-rm -rf buildroot/fs/ubi/
-rm -f buildroot/package/flex/flex-2.5.35-undefine_rpl_malloc_and_realloc.patch
-rm -f buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
-rm -rf buildroot/package/mysql_client/
-rm -rf buildroot/package/portmap/
-rm -rf buildroot/package/bluez3*
-rm -rf buildroot/package/ngircd/
-rm -rf buildroot/package/can-utils/
-rm -f buildroot/toolchain/uClibc/*.patch
-rm -f buildroot/package/ntp/ntp-nano.patch
-rm -f buildroot/target/generic/Config.in
-rm -rf buildroot/package/rt-tests
-rm -rf buildroot/package/libcanfestival
-rm -rf buildroot/package/python
-rm -rf buildroot/package/gsmmux
-rm -rf buildroot/package/imx-lib/
-rm -rf buildroot/package/imx-test/
-rm -rf buildroot/package/e2fsprogs/
-rm -rf buildroot/package/firmware-imx/
-rm -rf buildroot/package/multimedia/fsl-mm-codeclib/
-rm -rf buildroot/package/linux-firmware/
-rm -rf buildroot/package/uboot-tools/
-rm -rf buildroot/package/qtcreator/
-rm -rf buildroot/package/marble/
-rm -rf buildroot/package/cunit/
-rm -rf buildroot/package/gnokii/
-rm -rf buildroot/package/smstools3/
-rm -rf buildroot/package/wpa_supplicant/
-rm -rf buildroot/package/busybox/
-rm -rf buildroot/package/joe/
-rm -rf buildroot/package/gpsd/
-rm -rf buildroot/linux/
-rm -rf buildroot/package/freescale-imx/imx-lib/*.patch
-rm -rf buildroot/package/libpng/
-rm -rf buildroot/package/mmc-utils/
+####################################################
+# #
+# Removes files added or modified through patches. #
+# #
+# This file has been automatically generated. #
+# #
+####################################################
+
+rm -rf buildroot/Makefile
+rm -rf buildroot/arch/Config.in.arm
+rm -rf buildroot/boot/uboot/Config.in
+rm -rf buildroot/boot/uboot/uboot.mk
+rm -rf buildroot/linux/Config.ext.in
+rm -rf buildroot/linux/linux-ext-xenomai.mk
+rm -rf buildroot/package/Config.in
+rm -rf buildroot/package/Config.in.host
+rm -rf buildroot/package/agg/Config.in
+rm -rf buildroot/package/agg/agg.mk
+rm -rf buildroot/package/alsa-utils/alsa-utils.mk
+rm -rf buildroot/package/beremiz/Config.in
+rm -rf buildroot/package/beremiz/beremiz.mk
+rm -rf buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be_removed_with_kernel_3.1.patch
+rm -rf buildroot/package/bluez3-libs/Config.in
+rm -rf buildroot/package/bluez3-libs/bluez3-libs.mk
+rm -rf buildroot/package/bluez3-utils/Config.in
+rm -rf buildroot/package/bluez3-utils/bluez3-utils.mk
+rm -rf buildroot/package/bluez3/bluetooth.default
+rm -rf buildroot/package/bluez3/bluez-pand-devup.sh
+rm -rf buildroot/package/bluez3/bluez-utils-bluepin.sh
+rm -rf buildroot/package/bluez3/hcid.conf
+rm -rf buildroot/package/bluez3/rfcomm-getty
+rm -rf buildroot/package/bluez3/rfcomm.conf
+rm -rf buildroot/package/busybox/1.19.4/busybox-1.19.4-stty_add_rs485_config.patch
+rm -rf buildroot/package/busybox/1.20.2/busybox-1.20.2-stty_add_rs485_config.patch
+rm -rf buildroot/package/busybox/1.21.0/busybox-1.21.0-ifplugd-netlink-buffer.patch
+rm -rf buildroot/package/busybox/1.21.0/busybox-1.21.0-stty_add_rs485_config.patch
+rm -rf buildroot/package/busybox/Config.in
+rm -rf buildroot/package/busybox/busybox.mk
+rm -rf buildroot/package/busybox/snapshot/busybox-stty_add_rs485_config.patch
+rm -rf buildroot/package/cunit/Config.in
+rm -rf buildroot/package/cunit/cunit.mk
+rm -rf buildroot/package/cwiid/Config.in
+rm -rf buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.patch
+rm -rf buildroot/package/cwiid/cwiid-0.6.00-makefile_in-remove_wmgui.patch
+rm -rf buildroot/package/cwiid/cwiid.mk
+rm -rf buildroot/package/dbus/dbus.mk
+rm -rf buildroot/package/e-uae/Config.in
+rm -rf buildroot/package/e-uae/e-uae.mk
+rm -rf buildroot/package/e2fsprogs/e2fsprogs-allow-e4defrag-build-against-old-kernel-headers.patch
+rm -rf buildroot/package/flite/Config.in
+rm -rf buildroot/package/flite/flite.mk
+rm -rf buildroot/package/freescale-imx/Config.in
+rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib-fixes_build_on_imx27.patch
+rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
+rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib.mk
+rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/Config.in
+rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk.mk
+rm -rf buildroot/package/gnash/Config.in
+rm -rf buildroot/package/gnash/gnash.mk
+rm -rf buildroot/package/gnokii/Config.in
+rm -rf buildroot/package/gnokii/gnokii.mk
+rm -rf buildroot/package/gpm/Config.in
+rm -rf buildroot/package/gpm/gpm-1.20.7-removes_obsolete_functions.patch
+rm -rf buildroot/package/gpm/gpm-1.20.7-removes_strip_from_install.patch
+rm -rf buildroot/package/gpm/gpm.mk
+rm -rf buildroot/package/gpsd/Config.in
+rm -rf buildroot/package/gpsd/S50gpsd
+rm -rf buildroot/package/gpsd/gpsd.mk
+rm -rf buildroot/package/gsmmux/Config.in
+rm -rf buildroot/package/gsmmux/gsmmux.mk
+rm -rf buildroot/package/imagemagick/imagemagick.mk
+rm -rf buildroot/package/imx-test/Config.in
+rm -rf buildroot/package/imx-test/imx-test-01_fixes.patch
+rm -rf buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
+rm -rf buildroot/package/imx-test/imx-test.mk
+rm -rf buildroot/package/joe/Config.in
+rm -rf buildroot/package/joe/joe-3.7-disable-j0-j1-y0-y1-math-functions.patch
+rm -rf buildroot/package/joe/joe.mk
+rm -rf buildroot/package/lbreakout2/Config.in
+rm -rf buildroot/package/lbreakout2/lbreakout2.mk
+rm -rf buildroot/package/libcanfestival/Config.in
+rm -rf buildroot/package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
+rm -rf buildroot/package/libcanfestival/libcanfestival.mk
+rm -rf buildroot/package/libhid/libhid.mk
+rm -rf buildroot/package/libpng/libpng.mk
+rm -rf buildroot/package/ltrace/ltrace.mk
+rm -rf buildroot/package/ltris/Config.in
+rm -rf buildroot/package/ltris/ltris-force_screen_res.patch
+rm -rf buildroot/package/ltris/ltris.mk
+rm -rf buildroot/package/madplay/madplay.mk
+rm -rf buildroot/package/marble/Config.in
+rm -rf buildroot/package/marble/marble.mk
+rm -rf buildroot/package/matiec/Config.in
+rm -rf buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch
+rm -rf buildroot/package/matiec/matiec.mk
+rm -rf buildroot/package/mmc-utils/Config.in
+rm -rf buildroot/package/mmc-utils/mmc-utils.mk
+rm -rf buildroot/package/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
+rm -rf buildroot/package/mplayer/mplayer.mk
+rm -rf buildroot/package/multimedia/fsl-mm-codeclib/fsl-mm-codeclib.mk
+rm -rf buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
+rm -rf buildroot/package/openssl/openssl.mk
+rm -rf buildroot/package/opentyrian/Config.in
+rm -rf buildroot/package/opentyrian/opentyrian.mk
+rm -rf buildroot/package/owfs/Config.in
+rm -rf buildroot/package/owfs/owfs.mk
+rm -rf buildroot/package/pkg-generic.mk
+rm -rf buildroot/package/poppler/poppler.mk
+rm -rf buildroot/package/python-pygame/Config.in
+rm -rf buildroot/package/python-wx/Config.in
+rm -rf buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
+rm -rf buildroot/package/python-wx/python-wx.mk
+rm -rf buildroot/package/python/Config.in
+rm -rf buildroot/package/python/python.mk
+rm -rf buildroot/package/pywebradio/Config.in
+rm -rf buildroot/package/pywebradio/pywebradio.mk
+rm -rf buildroot/package/qt/Config.in
+rm -rf buildroot/package/qt/qt.mk
+rm -rf buildroot/package/qtcreator/Config.in.host
+rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patch
+rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_remote_console_open_menu.patch
+rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch
+rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.patch
+rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch
+rm -rf buildroot/package/qtcreator/qtcreator.mk
+rm -rf buildroot/package/quake-pak/Config.in
+rm -rf buildroot/package/quake-pak/quake-pak.mk
+rm -rf buildroot/package/sam7-pgm-ng/Config.in
+rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
+rm -rf buildroot/package/sdl_water/Config.in
+rm -rf buildroot/package/sdl_water/sdl_water.mk
+rm -rf buildroot/package/sdlquake/Config.in
+rm -rf buildroot/package/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
+rm -rf buildroot/package/sdlquake/sdlquake.mk
+rm -rf buildroot/package/shiboken/Config.in
+rm -rf buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch
+rm -rf buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch
+rm -rf buildroot/package/shiboken/shiboken-1.2.2-fix_shiboken_config_dir.patch
+rm -rf buildroot/package/shiboken/shiboken.mk
+rm -rf buildroot/package/slideshow/Config.in
+rm -rf buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+rm -rf buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+rm -rf buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
+rm -rf buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
+rm -rf buildroot/package/slideshow/slideshow.mk
+rm -rf buildroot/package/smstools3/Config.in
+rm -rf buildroot/package/smstools3/S50smsd
+rm -rf buildroot/package/smstools3/smstools3.mk
+rm -rf buildroot/package/snes9x/Config.in
+rm -rf buildroot/package/snes9x/snes9x-1.39-compile.patch
+rm -rf buildroot/package/snes9x/snes9x.mk
+rm -rf buildroot/package/tk/Config.in
+rm -rf buildroot/package/tk/tk.mk
+rm -rf buildroot/package/uboot-tools/2013.01/uboot-tools-2013.01-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
+rm -rf buildroot/package/uboot-tools/uboot-tools-2013.10-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0055-accept4-declaration-fix.patch
rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0056-assume-accept4-in-recent-arm-kernels.patch
-rm -rf buildroot/package/owfs/
-rm -rf buildroot/package/agg/
-rm -rf buildroot/package/gnash/
-rm -rf buildroot/package/xc3sprog/
-rm -rf buildroot/package/sam7-pgm-ng/
-rm -rf buildroot/package/tk/
-rm -rf buildroot/package/libhid/
-rm -rf buildroot/package/shiboken/
-rm -rf buildroot/package/python-wx/
-rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/
+rm -rf buildroot/package/wolf4sdl/Config.in
+rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
+rm -rf buildroot/package/wpa_supplicant/Config.in
+rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
+rm -rf buildroot/package/xc3sprog/Config.in
+rm -rf buildroot/package/xc3sprog/xc3sprog-fixes-version-detection.patch
+rm -rf buildroot/package/xc3sprog/xc3sprog-fixes-xc2c32a_qf32-jtag-id.patch
+rm -rf buildroot/package/xc3sprog/xc3sprog.mk
+rm -rf buildroot/package/xenomai/Config.in
+rm -rf buildroot/package/xenomai/xenomai.mk
+rm -rf buildroot/system/Config.in
+rm -rf buildroot/system/system.mk
+rm -rf buildroot/toolchain/toolchain-external/Config.in
+rm -rf buildroot/toolchain/toolchain-external/toolchain-external.mk
+rm -rf buildroot/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-add___kernel_long_and___kernel_ulong.patch
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index d949656..92528b6 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -107,7 +107,28 @@ if [ "$1" == "export" ]; then
else
echo "No VCS found"
fi
- echo -e "\n--- If you worked on Buildroot patches don't forget to eventually update patches/buildroot/$ARMADEUS_BUILDROOT_VERSION/cleanup_buildroot.sh !\n"
+
+ if [ "$QUILT_TARGET_NAME" == "Buildroot" ]; then
+ cat <<- EOF > $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh
+ #!/bin/bash
+
+ ####################################################
+ # #
+ # Removes files added or modified through patches. #
+ # #
+ # This file has been automatically generated. #
+ # #
+ ####################################################
+
+ EOF
+
+ cd $ARMADEUS_BUILDROOT_DIR
+ quilt files -a | sort | uniq | sed 's/^/rm -rf buildroot\//' >> $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh
+
+ echo -e "\n--- $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh has been updated. Please check if it is correct before committing:\n"
+ git diff --exit-code $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh
+ fi
+
exit 0
fi
@@ -210,4 +231,3 @@ echo -e "\n--- Your can now go to $QUILT_TARGET_DIR\nHappy hacking ! ;-)\n"
echo -e "__ Don't forget to do a \"$0 export\" after your modifications __\n"
exit 0
-
hooks/post-receive
--
armadeus
|