Skip to contentSkip to conversation

rpi-userland: Bump version

PATCH New Benoît Thébaudeau 3 participants 11 messages Aug 6, 2014

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 rpi-userland: Bump version

Bump version to f9e6f9f3def8dc18dc0092cd695ccf53b8ba3efe and revert local commit f22830e456833e98e11f09d2aa38017f5aaa557c 'rpi-userland: add patch fix missing libvcilcs install rules' in order to replace the local patch from this commit by the upstream commit 1ecc49c97b7be3d524cb4cfc97401f16b485a4ee 'vmcs_host: Fix missing install of libvcilcs.so'.

---

Changes in v2: New patch

---
 ...vmcs_host-add-install-rules-for-libvcilcs.patch | 23 ----------------------
 package/rpi-userland/rpi-userland.mk               |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch deleted +0 -23
deleted file mode 100644
index 05cf4b3..0000000
@@ -1,23 +0,0 @@
-From b60398837ddf39d4b605600abc167d4366e454a6 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <[email protected]>
-Date: Thu, 5 Jun 2014 00:06:08 +0200
-Subject: [PATCH] interface/vmcs_host: add install rules for libvcilcs
-
-Signed-off-by: Samuel Martin <[email protected]>
----
- interface/vmcs_host/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
-index 64ba2f8..8510f81 100755
---- a/interface/vmcs_host/CMakeLists.txt
-+++ b/interface/vmcs_host/CMakeLists.txt
-@@ -33,4 +33,5 @@ target_link_libraries(vchostif vchiq_arm vcos vcfiled_check)
- 
- add_subdirectory(linux/vcfiled)
- install(TARGETS vchostif DESTINATION lib)
-+install(TARGETS vcilcs DESTINATION lib)
- 
--- 
-2.0.0
-
package/rpi-userland/rpi-userland.mk +1 -1
index 717eab1..20f68fa 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = b555474b19310762255252d085e57599ea573889
+RPI_USERLAND_VERSION = f9e6f9f3def8dc18dc0092cd695ccf53b8ba3efe
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 2/3 rpi-userland: .mk: Indent rules with tabs

---

Changes in v2: New patch

---
 package/rpi-userland/rpi-userland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/rpi-userland/rpi-userland.mk +1 -1
index 20f68fa..81ed95c 100644
@@ -14,7 +14,7 @@ RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
 RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
 
 define RPI_USERLAND_POST_TARGET_CLEANUP
-    rm -Rf $(TARGET_DIR)/usr/src
+	rm -Rf $(TARGET_DIR)/usr/src
 endef
 RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP
 
Signature · 1 line
1.9.1
#2 lore raw

PATCH v2 2/3 rpi-userland: .mk: Indent rules with tabs

Benoit, All,

On 2014-08-06 15:39 +0200, Beno?t Th?baudeau spake thusly:

Quoted 1 line

Regards,
Yann E. MORIN.

Quoted 27 lines

---

Changes in v2: New patch

---
 package/rpi-userland/rpi-userland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/rpi-userland/rpi-userland.mk +1 -1
index 20f68fa..81ed95c 100644
@@ -14,7 +14,7 @@ RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
 RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
 
 define RPI_USERLAND_POST_TARGET_CLEANUP
-    rm -Rf $(TARGET_DIR)/usr/src
+	rm -Rf $(TARGET_DIR)/usr/src
 endef
 RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP
 
Signature · 6 lines
1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH v2 3/3 rpi-userland: Fix vcfiled startup

In reply to Benoît Thébaudeau

The VideoCore file server daemon startup script installed from this package is not compatible with BuildRoot (because of its naming and other Debian dependencies), which prevented vcfiled from starting. Hence, prevent this package from installing its vcfiled startup script, and install a vcfiled SysV init script suitable for BuildRoot.

---

Changes in v2:
- Indent .mk rules with tabs.
- Simplify the new vcfiled startup script.
- Rename S97vcfiled to S94vcfiled for a better integration with existing init scripts.

---
 package/rpi-userland/S94vcfiled      | 47 ++++++++++++++++++++++++++++++++++++
 package/rpi-userland/rpi-userland.mk |  8 ++++++
 2 files changed, 55 insertions(+)
 create mode 100755 package/rpi-userland/S94vcfiled
package/rpi-userland/S94vcfiled new file +47 -0
new file mode 100755
index 0000000..25a0fcd
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+NAME=vcfiled
+DESC="VideoCore file server daemon $NAME"
+DAEMON="/usr/sbin/$NAME"
+DAEMON_ARGS=""
+CFGFILE="/etc/default/$NAME"
+PIDFILE="/var/run/$NAME/$NAME"
+
+# Read configuration variable file if it is present
+[ -r "$CFGFILE" ] && . "$CFGFILE"
+
+do_start()
+{
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS &&
+			echo "done" || echo "failed"
+}
+
+do_stop()
+{
+	echo -n "Stopping $DESC: "
+	if start-stop-daemon -K -q -R TERM/30/KILL/5 -p "$PIDFILE" -n "$NAME"; then
+		# This daemon does not remove its PID file when it exits.
+		rm -f "$PIDFILE"
+		echo "done"
+	else
+		echo "failed"
+	fi
+}
+
+case "$1" in
+	start)
+		do_start
+		;;
+	stop)
+		do_stop
+		;;
+	restart|reload)
+		do_stop
+		do_start
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}" >&2
+		exit 1
+		;;
+esac
package/rpi-userland/rpi-userland.mk +8 -0
index 81ed95c..0d29f24 100644
@@ -13,7 +13,15 @@ RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
 
 RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
 
+define RPI_USERLAND_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/rpi-userland/S94vcfiled \
+			$(TARGET_DIR)/etc/init.d/S94vcfiled
+endef
+
 define RPI_USERLAND_POST_TARGET_CLEANUP
+	rm -f $(TARGET_DIR)/etc/init.d/vcfiled
+	rm -f $(TARGET_DIR)/usr/share/install/vcfiled
+	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/install
 	rm -Rf $(TARGET_DIR)/usr/src
 endef
 RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP
Signature · 1 line
1.9.1
#5 lore raw

PATCH v2 3/3 rpi-userland: Fix vcfiled startup

Benoit, All,

On 2014-08-06 15:39 +0200, Beno?t Th?baudeau spake thusly:

Quoted 5 lines

The VideoCore file server daemon startup script installed from this package is not compatible with BuildRoot (because of its naming and other Debian dependencies), which prevented vcfiled from starting. Hence, prevent this package from installing its vcfiled startup script, and install a vcfiled SysV init script suitable for BuildRoot.

I'm not sure I would be happy that the GPU is allowed uncontrolled access to the filesystem.

Please, make this an option, defaulting to 'n', so the user can willingly choose to install it or not.

Otherwise, see below...

Quoted 1 line

[--SNIP--]

Quoted 6 lines
package/rpi-userland/S94vcfiled new file +0 -0
new file mode 100755
index 0000000..25a0fcd

package/rpi-userland/S94vcfiled line 8

Quoted 8 lines
package/rpi-userland/S94vcfiled new file +8 -0
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+NAME=vcfiled
+DESC="VideoCore file server daemon $NAME"
+DAEMON="/usr/sbin/$NAME"
+DAEMON_ARGS=""
+CFGFILE="/etc/default/$NAME"
+PIDFILE="/var/run/$NAME/$NAME"

Are you sure about the path to the PID file?
What about:

    PIDFILE="/var/run/$NAME.pid"

Othwerwise, looks good after a casual look. Ditto your previous patches, I'll try to find some time tonight to test it.

Regards,
Yann E. MORIN.

Quoted 65 lines
package/rpi-userland/S94vcfiled new file +38 -0
+# Read configuration variable file if it is present
+[ -r "$CFGFILE" ] && . "$CFGFILE"
+
+do_start()
+{
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS &&
+			echo "done" || echo "failed"
+}
+
+do_stop()
+{
+	echo -n "Stopping $DESC: "
+	if start-stop-daemon -K -q -R TERM/30/KILL/5 -p "$PIDFILE" -n "$NAME"; then
+		# This daemon does not remove its PID file when it exits.
+		rm -f "$PIDFILE"
+		echo "done"
+	else
+		echo "failed"
+	fi
+}
+
+case "$1" in
+	start)
+		do_start
+		;;
+	stop)
+		do_stop
+		;;
+	restart|reload)
+		do_stop
+		do_start
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}" >&2
+		exit 1
+		;;
+esac
package/rpi-userland/rpi-userland.mk +8 -0
index 81ed95c..0d29f24 100644
@@ -13,7 +13,15 @@ RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
 
 RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
 
+define RPI_USERLAND_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/rpi-userland/S94vcfiled \
+			$(TARGET_DIR)/etc/init.d/S94vcfiled
+endef
+
 define RPI_USERLAND_POST_TARGET_CLEANUP
+	rm -f $(TARGET_DIR)/etc/init.d/vcfiled
+	rm -f $(TARGET_DIR)/usr/share/install/vcfiled
+	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/install
 	rm -Rf $(TARGET_DIR)/usr/src
 endef
 RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP
Signature · 6 lines
1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#6 lore raw

PATCH v2 3/3 rpi-userland: Fix vcfiled startup

Dear Yann E. MORIN,

Quoted 11 lines · Yann E. MORIN

Benoit, All,

On 2014-08-06 15:39 +0200, Beno?t Th?baudeau spake thusly:

Quoted 7 lines

The VideoCore file server daemon startup script installed from this package is
not compatible with BuildRoot (because of its naming and other Debian dependencies), which prevented vcfiled from starting. Hence, prevent this package from installing its vcfiled startup script, and install a vcfiled SysV
init script suitable for BuildRoot.

Quoted 5 lines

I'm not sure I would be happy that the GPU is allowed uncontrolled access to the filesystem.

Please, make this an option, defaulting to 'n', so the user can willingly choose to install it or not.

Will do.

Quoted 22 lines

Otherwise, see below...

Quoted 1 line

[--SNIP--]

Quoted 7 lines
package/rpi-userland/S94vcfiled new file +0 -0
new file mode 100755
index 0000000..25a0fcd

package/rpi-userland/S94vcfiled line 8

Quoted 8 lines
package/rpi-userland/S94vcfiled new file +8 -0
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+NAME=vcfiled
+DESC="VideoCore file server daemon $NAME"
+DAEMON="/usr/sbin/$NAME"
+DAEMON_ARGS=""
+CFGFILE="/etc/default/$NAME"
+PIDFILE="/var/run/$NAME/$NAME"

Are you sure about the path to the PID file?
What about:

Quoted 1 line
    PIDFILE="/var/run/$NAME.pid"

Yes, sure, this is the path used by vcfiled, which creates its PID file itself rather than relying on start-stop-daemon -m for that.

Quoted 2 lines

Othwerwise, looks good after a casual look. Ditto your previous patches, I'll try to find some time tonight to test it.

Thanks.

[...]

Regards,
Beno?t

#7 lore raw

PATCH v2 3/3 rpi-userland: Fix vcfiled startup

Dear Yann E. MORIN,

Quoted 6 lines · Beno?t Th?baudeau

Dear Yann E. MORIN,

Quoted 3 lines · Yann E. MORIN

Benoit, All,

On 2014-08-06 15:39 +0200, Beno?t Th?baudeau spake thusly:

[...]

Quoted 24 lines
Quoted 22 lines

Otherwise, see below...

Quoted 1 line

[--SNIP--]

Quoted 7 lines
package/rpi-userland/S94vcfiled new file +0 -0
new file mode 100755
index 0000000..25a0fcd

package/rpi-userland/S94vcfiled line 8

Quoted 8 lines
package/rpi-userland/S94vcfiled new file +8 -0
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+NAME=vcfiled
+DESC="VideoCore file server daemon $NAME"
+DAEMON="/usr/sbin/$NAME"
+DAEMON_ARGS=""
+CFGFILE="/etc/default/$NAME"
+PIDFILE="/var/run/$NAME/$NAME"

Are you sure about the path to the PID file?
What about:

Quoted 1 line
    PIDFILE="/var/run/$NAME.pid"
Quoted 2 lines

Yes, sure, this is the path used by vcfiled, which creates its PID file itself rather than relying on start-stop-daemon -m for that.

I have checked the code, and this path can be overridden by defining VCFILED_LOCKFILE, so I can set it to '/var/run/vcfiled.pid' if you really prefer. It's up to you. You tell me.

[...]

Regards,
Beno?t

#8 lore raw

PATCH v2 3/3 rpi-userland: Fix vcfiled startup

Benoit, All,

On 2014-08-06 21:56 +0200, Beno?t Th?baudeau spake thusly:

Quoted 7 lines
Quoted 7 lines · Yann E. MORIN
Quoted 6 lines

On 2014-08-06 15:39 +0200, Beno?t Th?baudeau spake thusly:

Quoted 1 line

+PIDFILE="/var/run/$NAME/$NAME"

Are you sure about the path to the PID file?
What about:

    PIDFILE="/var/run/$NAME.pid"

[--SNIP--]

Quoted 3 lines

I have checked the code, and this path can be overridden by defining VCFILED_LOCKFILE, so I can set it to '/var/run/vcfiled.pid' if you really prefer. It's up to you. You tell me.

Well, I think it would be better, yes. There's no need to create a directory just to put the PID file.

Thanks!

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#9 lore raw

PATCH v2 1/3 rpi-userland: Bump version

In reply to Benoît Thébaudeau

Benoit, All,

On 2014-08-06 15:39 +0200, Beno?t Th?baudeau spake thusly:

Quoted 7 lines

Bump version to f9e6f9f3def8dc18dc0092cd695ccf53b8ba3efe and revert local commit f22830e456833e98e11f09d2aa38017f5aaa557c 'rpi-userland: add patch fix missing libvcilcs install rules' in order to replace the local patch from this commit by the upstream commit 1ecc49c97b7be3d524cb4cfc97401f16b485a4ee 'vmcs_host: Fix missing install of libvcilcs.so'.

I'll try to find some time to test it tonight.

Regards,
Yann E. MORIN.

Quoted 58 lines

---

Changes in v2: New patch

---
 ...vmcs_host-add-install-rules-for-libvcilcs.patch | 23 ----------------------
 package/rpi-userland/rpi-userland.mk               |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch deleted +0 -23
deleted file mode 100644
index 05cf4b3..0000000
@@ -1,23 +0,0 @@
-From b60398837ddf39d4b605600abc167d4366e454a6 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <[email protected]>
-Date: Thu, 5 Jun 2014 00:06:08 +0200
-Subject: [PATCH] interface/vmcs_host: add install rules for libvcilcs
-
-Signed-off-by: Samuel Martin <[email protected]>
----
- interface/vmcs_host/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
-index 64ba2f8..8510f81 100755
---- a/interface/vmcs_host/CMakeLists.txt
-+++ b/interface/vmcs_host/CMakeLists.txt
-@@ -33,4 +33,5 @@ target_link_libraries(vchostif vchiq_arm vcos vcfiled_check)
- 
- add_subdirectory(linux/vcfiled)
- install(TARGETS vchostif DESTINATION lib)
-+install(TARGETS vcilcs DESTINATION lib)
- 
--- 
-2.0.0
-
package/rpi-userland/rpi-userland.mk +1 -1
index 717eab1..20f68fa 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = b555474b19310762255252d085e57599ea573889
+RPI_USERLAND_VERSION = f9e6f9f3def8dc18dc0092cd695ccf53b8ba3efe
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
Signature · 6 lines
1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#10 lore raw

PATCH v2 1/3 rpi-userland: Bump version

In reply to Benoît Thébaudeau

Dear Beno?t Th?baudeau,

Quoted 7 lines · Beno?t Th?baudeau

Bump version to f9e6f9f3def8dc18dc0092cd695ccf53b8ba3efe and revert local commit f22830e456833e98e11f09d2aa38017f5aaa557c 'rpi-userland: add patch fix missing libvcilcs install rules' in order to replace the local patch from this commit by the upstream commit 1ecc49c97b7be3d524cb4cfc97401f16b485a4ee 'vmcs_host: Fix missing install of libvcilcs.so'.

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com