[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-451-gf136d1e
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-451-gf136d1e
|
From: Julien B a. A. <ar...@us...> - 2013-09-20 15:19:29
|
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 f136d1e302a1b3bcc3412cd11b0406d0e4c42a58 (commit)
via b7f530b0988934cbc64e2d410e29f107ba256d13 (commit)
via 38ada73ee8f054dcae9ba6a1144d6e17b2b5a2df (commit)
from be428adca76ec97958af7b0a28e2861e80d1c95f (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 f136d1e302a1b3bcc3412cd11b0406d0e4c42a58
Author: Julien Boibessot <jul...@ar...>
Date: Fri Sep 20 17:19:08 2013 +0200
[BUILDROOT][2013.05] Makes initrd generation works again with armadeus adaptations to BR
commit b7f530b0988934cbc64e2d410e29f107ba256d13
Author: Julien Boibessot <jul...@ar...>
Date: Fri Sep 20 16:18:11 2013 +0200
[BUILDROOT][2013.05] Mark patches 211 as a BR upstream one
commit 38ada73ee8f054dcae9ba6a1144d6e17b2b5a2df
Author: Julien Boibessot <jul...@ar...>
Date: Fri Sep 20 16:13:58 2013 +0200
[BUILDROOT][2013.05] Fixes pywebradio package installation
-----------------------------------------------------------------------
Summary of changes:
...linux-add-board-name-to-initrd-image-name.patch | 18 ++++++++++++++++
...d => 123-armadeus-pywebradio-add-package.patch} | 22 ++++++-------------
.../buildroot/2013.05/211-cups-fix_site_url.patch | 19 +++++++++++-----
patches/buildroot/2013.05/cleanup_buildroot.sh | 1 +
4 files changed, 39 insertions(+), 21 deletions(-)
create mode 100644 patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
rename patches/buildroot/2013.05/{123-pywebradio-add_package.patch.tobefixed => 123-armadeus-pywebradio-add-package.patch} (61%)
diff --git a/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch b/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
new file mode 100644
index 0000000..5bdc59a
--- /dev/null
+++ b/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
@@ -0,0 +1,18 @@
+We rename images in binaries/ directory, so take that into account when Linux
+needs to find cpio image to generate initrd.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk 2013-09-20 17:00:19.172366934 +0200
++++ buildroot/linux/linux.mk 2013-09-20 17:00:53.184535598 +0200
+@@ -185,7 +185,7 @@
+ $(if $(BR2_TARGET_ROOTFS_INITRAMFS),
+ touch $(BINARIES_DIR)/rootfs.cpio
+ $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
+- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.cpio\",$(@D)/.config)
++ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.cpio\",$(@D)/.config)
+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
+ $(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
diff --git a/patches/buildroot/2013.05/123-pywebradio-add_package.patch.tobefixed b/patches/buildroot/2013.05/123-armadeus-pywebradio-add-package.patch
similarity index 61%
rename from patches/buildroot/2013.05/123-pywebradio-add_package.patch.tobefixed
rename to patches/buildroot/2013.05/123-armadeus-pywebradio-add-package.patch
index cc145d2..f603691 100644
--- a/patches/buildroot/2013.05/123-pywebradio-add_package.patch.tobefixed
+++ b/patches/buildroot/2013.05/123-armadeus-pywebradio-add-package.patch
@@ -1,7 +1,7 @@
Index: buildroot/package/multimedia/Config.in
===================================================================
---- buildroot.orig/package/multimedia/Config.in 2012-02-21 16:44:45.000000000 +0100
-+++ buildroot/package/multimedia/Config.in 2012-02-21 16:45:43.000000000 +0100
+--- buildroot.orig/package/multimedia/Config.in 2013-09-02 21:35:20.250475033 +0200
++++ buildroot/package/multimedia/Config.in 2013-09-10 11:38:45.375000535 +0200
@@ -20,6 +20,7 @@
source "package/multimedia/mpd/Config.in"
source "package/multimedia/mpg123/Config.in"
@@ -13,7 +13,7 @@ Index: buildroot/package/multimedia/Config.in
Index: buildroot/package/pywebradio/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pywebradio/Config.in 2012-02-21 16:45:43.000000000 +0100
++++ buildroot/package/pywebradio/Config.in 2013-09-10 11:38:45.375000535 +0200
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYWEBRADIO
+ bool "pywebradio"
@@ -24,25 +24,17 @@ Index: buildroot/package/pywebradio/Config.in
Index: buildroot/package/pywebradio/pywebradio.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pywebradio/pywebradio.mk 2012-02-21 16:45:43.000000000 +0100
-@@ -0,0 +1,28 @@
++++ buildroot/package/pywebradio/pywebradio.mk 2013-09-20 16:11:40.685894942 +0200
+@@ -0,0 +1,20 @@
+#############################################################
+#
+# pywebradio
+#
+#############################################################
+
-+PYWEBRADIO_TRUNK:=http://forge.doumenc.org/svn/pyqtradio/trunk
-+PYWEBRADIO_SITE:=
++PYWEBRADIO_SITE = http://forge.doumenc.org/svn/pyqtradio/trunk
++PYWEBRADIO_SITE_METHOD = svn
+PYWEBRADIO_VERSION:=421
-+PYWEBRADIO_NAME:=pywebradio-svn-r$(PYWEBRADIO_VERSION)
-+PYWEBRADIO_DIR:=$(BUILD_DIR)/$(PYWEBRADIO_NAME)
-+PYWEBRADIO_SOURCE:=$(PYWEBRADIO_NAME).tar.bz2
-+
-+# GENTARGETS do not allow to get sources from SVN ??
-+#$(DL_DIR)/$(PYWEBRADIO_SOURCE):
-+# $(SVN_CO) -r $(PYWEBRADIO_VERSION) $(PYWEBRADIO_TRUNK) $(PYWEBRADIO_DIR)
-+# tar -cv -C $(BUILD_DIR) $(PYWEBRADIO_NAME) | bzip2 - -c > $@
+
+define PYWEBRADIO_INSTALL_TARGET_CMDS
+ cd $(@D); \
diff --git a/patches/buildroot/2013.05/211-cups-fix_site_url.patch b/patches/buildroot/2013.05/211-cups-fix_site_url.patch
index 40b8dc7..a7e0b49 100644
--- a/patches/buildroot/2013.05/211-cups-fix_site_url.patch
+++ b/patches/buildroot/2013.05/211-cups-fix_site_url.patch
@@ -1,12 +1,17 @@
-Fix CUPS site URL.
+From ca0b3486e1e0ab96e73a29c53bfb326e92151333 Mon Sep 17 00:00:00 2001
+From: Jelle Sels <jel...@gm...>
+Date: Tue, 11 Jun 2013 18:39:40 +0000
+Subject: cups: fix upstream URL
-Signed-off-by: Jérémie Scheer <jer...@ar...>
+Signed-off-by: Jelle Sels <jel...@gm...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
---
+(limited to 'package/cups/cups.mk')
-Index: buildroot/package/cups/cups.mk
-===================================================================
---- buildroot.orig/package/cups/cups.mk 2013-05-31 22:29:04.000000000 +0200
-+++ buildroot/package/cups/cups.mk 2013-09-19 10:26:29.000000000 +0200
+diff --git a/package/cups/cups.mk b/package/cups/cups.mk
+index f8ace71..9b8d7c5 100644
+--- a/package/cups/cups.mk
++++ b/package/cups/cups.mk
@@ -6,7 +6,7 @@
CUPS_VERSION = 1.3.11
@@ -16,3 +21,5 @@ Index: buildroot/package/cups/cups.mk
CUPS_INSTALL_STAGING = YES
CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
+--
+cgit v0.9.1
diff --git a/patches/buildroot/2013.05/cleanup_buildroot.sh b/patches/buildroot/2013.05/cleanup_buildroot.sh
index 1532894..4e8d879 100755
--- a/patches/buildroot/2013.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.05/cleanup_buildroot.sh
@@ -79,3 +79,4 @@ rm -f buildroot/package/busybox/1.21.0/busybox-1.21.0-stty_add_rs485_config.patc
rm -f buildroot/package/busybox/snapshot/busybox-stty_add_rs485_config.patch
rm -rf buildroot/package/joe/
rm -rf buildroot/package/gpsd/
+rm -rf buildroot/linux/
hooks/post-receive
--
armadeus
|
