Re: [yocto] [meta-raspberrypi][PATCH 6/7] userland: Update to 8700279495e266378d36092ccf86424f0ee2539f
Merged.
On Sun, Feb 10, 2013 at 12:11 AM, Andrei Gherzan wrote:
> * install_vmcs not needed anymore
> * By default package is installed in /opt/vc. Move everything in ${prefix}.
> * Move recipe in recipes-graphics
> * Add PACKAGE_ARCH = MACHINE_ARCH
>
> Signed-off-by: Andrei Gherzan
> ---
> recipes-bcm/userland/userland-git/install_vmcs | 279
>
> recipes-bcm/userland/userland_git.bb | 43
> recipes-graphics/userland/userland_git.bb | 39
> 3 files changed, 39 insertions(+), 322 deletions(-)
> delete mode 100755 recipes-bcm/userland/userland-git/install_vmcs
> delete mode 100644 recipes-bcm/userland/userland_git.bb
> create mode 100644 recipes-graphics/userland/userland_git.bb
>
> diff --git a/recipes-bcm/userland/userland-git/install_vmcs
> b/recipes-bcm/userland/userland-git/install_vmcs
> deleted file mode 100755
> index 980522e..000
> --- a/recipes-bcm/userland/userland-git/install_vmcs
> +++ /dev/null
> @@ -1,279 +0,0 @@
> -#!/bin/sh
> -
> -# edit this file only at \makefiles\cmake\scripts\install_vmcs
> -# update (via root staging area) using cmake {args} , etc.
> -
> -cmd="$0"
> -cmd_dir="`dirname -- "$cmd"`"
> -cmd_dir=`(cd "$cmd_dir">/dev/null;pwd)`
> -cmd_name="`basename -- $cmd`"
> -
> -# this command should be run as root from ${dir_install}/sbin
> -
> -dir_install="`dirname -- "$cmd_dir"`"
> -dir_data="$dir_install/share/install"
> -dir_sd="/sd"
> -
> -do_force=false
> -
> -# install contents of $dir_data into the system
> -
> -if [ "`whoami`" != "root" ]; then
> -echo "$cmd_name: you need to be root to execute this command">&2
> -exit 1
> -fi
> -
> -[ "_$1" = "_-f" -o "_$1" = "_--force" ] && { do_force=true; shift; }
> -
> -
> -# Uninstall script
> -
> -#
> -#
> -
> -create_uninstall()
> -{ cat <<'EOF'
> -#!/bin/sh
> -
> -
> - WARNING: this script is written and overwritten by $cmd - don't edit
> -
> -
> -cmd="$0"
> -cmd_dir="`dirname -- "$cmd"`"
> -cmd_dir=`(cd "$cmd_dir">/dev/null;pwd)`
> -cmd_name="`basename -- "$cmd"`"
> -
> -# this command should be run from /sbin
> -
> -if [ "`whoami`" != "root" ]; then
> -echo "$cmd_name: you need to be root to execute this command">&2
> -exit 1
> -fi
> -
> -# uninstall the new libraries
> -
> -if [ -f /etc/ld.so.conf.d/vmcs.conf ]; then
> -rm /etc/ld.so.conf.d/vmcs.conf
> -ldconfig
> -fi
> -
> -vcfiled=/etc/init.d/vcfiled
> -if [ -x $vcfiled ]; then
> -$vcfiled stop
> -if update-rc.d -f vcfiled remove; then
> -rm -f $vcfiled
> -else
> -echo "$cmd_name: failed to install $vcfiled, sorry">&2
> -fi
> -fi
> -
> -EOF
> -}
> -
> -
> -#
> -#
> -
> -rc=0
> -
> -# install un-installation script
> -
> -if [ -f "$cmd_dir/uninstall_vmcs" ]; then
> -if mv -f "$cmd_dir/uninstall_vmcs" "$cmd_dir/uninstall_last_vmcs";
> then
> -echo "$cmd_name: previous installation's uninstallation script
> saved in">&2
> -echo "$cmd_name: $cmd_dir/uninstall_last_vmcs">&2
> -else
> -echo "$cmd_name: failed to rename previous installation's
> uninstallation script">&2
> -fi
> -fi
> -create_uninstall > "$cmd_dir/uninstall_vmcs"
> -chmod +x "$cmd_dir/uninstall_vmcs"
> -
> -# install the new libraries
> -
> -if $do_force || [ -d /etc/ld.so.conf.d ]; then
> -if $do_force || [ ! -f /etc/ld.so.conf.d/vmcs.conf ]; then
> -if [ ! -f "$dir_data/vmcs.conf" ]; then
> -echo "$cmd_name: expected file missing in
> $dir_data/vmcs.conf">&2
> -rc=1
> -else
> -mkdir -p /etc/ld.so.conf.d
> -cp -af "$dir_data/vmcs.conf" /etc/ld.so.conf.d/vmcs.conf
> -ldconfig
> -fi
> -fi
> -else
> -echo "$cmd_name: don't know how to install libraries, sorry">&2
> -rc=2
> -fi
> -
> -# install VC file daemon
> -
> -if $do_force || [ ! -f /etc/init.d/vcfiled ]; then
> -if [ ! -f "$dir_data/vcfiled" ]; then
> -echo "$cmd_name: expected file missing in $dir_data/vcfiled">&2
> -rc=3
> -else
> -cp -af "$dir_data/vcfiled" /etc/init.d/vcfiled
> -if ! update-rc.d vcfiled defaults 16; then
> -echo "$cmd_name: don't know how to install new
> /etc/init.d/vcfiled, sorry">&2
> -rc=4
> -elif ! update-rc.d vcfiled enable; then
> -echo "$cmd_name: failed to enable new /etc/init.d/vcfiled,
> sorry">&2
> -rc=5
> -fi
> -fi
> -fi
> -
> -# make sure vchiq device finder is installed
> -
> -if $do_force || [ ! -f /etc/init.d/vchiq ]; then
> -if [ ! -f "$dir_data/vchiq" ]; then
> -echo "$cmd_name: expected file missing in $dir_data/vchiq">&2
> -else
> -cp -af "$dir_data/vchiq" /etc/init.d/vchiq
> -if ! update-rc.d vchiq defaults 12; then
> -echo "$cmd_name: don't know how to install new
> /etc/init.d/vc
[yocto] [meta-raspberrypi][PATCH 6/7] userland: Update to 8700279495e266378d36092ccf86424f0ee2539f
* install_vmcs not needed anymore
* By default package is installed in /opt/vc. Move everything in ${prefix}.
* Move recipe in recipes-graphics
* Add PACKAGE_ARCH = MACHINE_ARCH
Signed-off-by: Andrei Gherzan
---
recipes-bcm/userland/userland-git/install_vmcs | 279
recipes-bcm/userland/userland_git.bb | 43
recipes-graphics/userland/userland_git.bb | 39
3 files changed, 39 insertions(+), 322 deletions(-)
delete mode 100755 recipes-bcm/userland/userland-git/install_vmcs
delete mode 100644 recipes-bcm/userland/userland_git.bb
create mode 100644 recipes-graphics/userland/userland_git.bb
diff --git a/recipes-bcm/userland/userland-git/install_vmcs
b/recipes-bcm/userland/userland-git/install_vmcs
deleted file mode 100755
index 980522e..000
--- a/recipes-bcm/userland/userland-git/install_vmcs
+++ /dev/null
@@ -1,279 +0,0 @@
-#!/bin/sh
-
-# edit this file only at \makefiles\cmake\scripts\install_vmcs
-# update (via root staging area) using cmake {args} , etc.
-
-cmd="$0"
-cmd_dir="`dirname -- "$cmd"`"
-cmd_dir=`(cd "$cmd_dir">/dev/null;pwd)`
-cmd_name="`basename -- $cmd`"
-
-# this command should be run as root from ${dir_install}/sbin
-
-dir_install="`dirname -- "$cmd_dir"`"
-dir_data="$dir_install/share/install"
-dir_sd="/sd"
-
-do_force=false
-
-# install contents of $dir_data into the system
-
-if [ "`whoami`" != "root" ]; then
-echo "$cmd_name: you need to be root to execute this command">&2
-exit 1
-fi
-
-[ "_$1" = "_-f" -o "_$1" = "_--force" ] && { do_force=true; shift; }
-
-
-# Uninstall script
-
-#
-#
-
-create_uninstall()
-{ cat <<'EOF'
-#!/bin/sh
-
-
- WARNING: this script is written and overwritten by $cmd - don't edit
-
-
-cmd="$0"
-cmd_dir="`dirname -- "$cmd"`"
-cmd_dir=`(cd "$cmd_dir">/dev/null;pwd)`
-cmd_name="`basename -- "$cmd"`"
-
-# this command should be run from /sbin
-
-if [ "`whoami`" != "root" ]; then
-echo "$cmd_name: you need to be root to execute this command">&2
-exit 1
-fi
-
-# uninstall the new libraries
-
-if [ -f /etc/ld.so.conf.d/vmcs.conf ]; then
-rm /etc/ld.so.conf.d/vmcs.conf
-ldconfig
-fi
-
-vcfiled=/etc/init.d/vcfiled
-if [ -x $vcfiled ]; then
-$vcfiled stop
-if update-rc.d -f vcfiled remove; then
-rm -f $vcfiled
-else
-echo "$cmd_name: failed to install $vcfiled, sorry">&2
-fi
-fi
-
-EOF
-}
-
-
-#
-#
-
-rc=0
-
-# install un-installation script
-
-if [ -f "$cmd_dir/uninstall_vmcs" ]; then
-if mv -f "$cmd_dir/uninstall_vmcs" "$cmd_dir/uninstall_last_vmcs"; then
-echo "$cmd_name: previous installation's uninstallation script saved
in">&2
-echo "$cmd_name: $cmd_dir/uninstall_last_vmcs">&2
-else
-echo "$cmd_name: failed to rename previous installation's
uninstallation script">&2
-fi
-fi
-create_uninstall > "$cmd_dir/uninstall_vmcs"
-chmod +x "$cmd_dir/uninstall_vmcs"
-
-# install the new libraries
-
-if $do_force || [ -d /etc/ld.so.conf.d ]; then
-if $do_force || [ ! -f /etc/ld.so.conf.d/vmcs.conf ]; then
-if [ ! -f "$dir_data/vmcs.conf" ]; then
-echo "$cmd_name: expected file missing in $dir_data/vmcs.conf">&2
-rc=1
-else
-mkdir -p /etc/ld.so.conf.d
-cp -af "$dir_data/vmcs.conf" /etc/ld.so.conf.d/vmcs.conf
-ldconfig
-fi
-fi
-else
-echo "$cmd_name: don't know how to install libraries, sorry">&2
-rc=2
-fi
-
-# install VC file daemon
-
-if $do_force || [ ! -f /etc/init.d/vcfiled ]; then
-if [ ! -f "$dir_data/vcfiled" ]; then
-echo "$cmd_name: expected file missing in $dir_data/vcfiled">&2
-rc=3
-else
-cp -af "$dir_data/vcfiled" /etc/init.d/vcfiled
-if ! update-rc.d vcfiled defaults 16; then
-echo "$cmd_name: don't know how to install new
/etc/init.d/vcfiled, sorry">&2
-rc=4
-elif ! update-rc.d vcfiled enable; then
-echo "$cmd_name: failed to enable new /etc/init.d/vcfiled,
sorry">&2
-rc=5
-fi
-fi
-fi
-
-# make sure vchiq device finder is installed
-
-if $do_force || [ ! -f /etc/init.d/vchiq ]; then
-if [ ! -f "$dir_data/vchiq" ]; then
-echo "$cmd_name: expected file missing in $dir_data/vchiq">&2
-else
-cp -af "$dir_data/vchiq" /etc/init.d/vchiq
-if ! update-rc.d vchiq defaults 12; then
-echo "$cmd_name: don't know how to install new /etc/init.d/vchiq,
sorry">&2
-rc=6
-elif ! update-rc.d vchiq enable; then
-echo "$cmd_name: failed to enable new /etc/init.d/vchiq, sorry">&2
-rc=7
-fi
-fi
-fi
-
-# set up a module directory from SD card if possible
-
-current_moddir=/lib/modules
-pkg_moddir=${dir_install}$current_moddir
-sd_moddir=/boot$current_moddir
-
-if [ -h "$pkg_moddir" ];
