[oe-commits] org.oe.dev merge of 'ca79cbe803b8aa5bd6d3ebe944504e5af8234d59'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Aug 10 11:12:29 UTC 2007
merge of 'ca79cbe803b8aa5bd6d3ebe944504e5af8234d59'
and 'fc9df3f6bc3d16669463fde20e46e8b5a683ad84'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 59d9c0cd76234ed61c133780c90859a6eec60363
ViewMTN: http://monotone.openembedded.org/revision.psp?id=59d9c0cd76234ed61c133780c90859a6eec60363
Files:
1
packages/binutils/binutils-cvs/binutils-100_cflags_for_build.patch
packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-200-build_modules.patch
packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-210-cflags.patch
packages/binutils/binutils-cvs/binutils-2.15.91.0.1-uclibc-100-conf.patch
packages/binutils/binutils-cvs/110-arm-eabi-conf.patch
packages/binutils/binutils-cvs/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
packages/binutils/binutils-cvs/binutils-uclibc-300-001_ld_makefile_patch.patch
packages/binutils/binutils-cvs/binutils-uclibc-300-006_better_file_error.patch
packages/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch
packages/binutils/binutils-cvs/build_fix.patch
packages/fakeroot/fakeroot-native_1.7.1.bb
packages/fakeroot/fakeroot_1.7.1.bb
packages/fakeroot/files/work-with-older-libtool.patch
conf/bitbake.conf
packages/binutils/binutils.inc
packages/binutils/binutils_cvs.bb
packages/ncurses/ncurses.inc
packages/ncurses/ncurses_5.4.bb
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
packages/pulseaudio/pulseaudio_0.9.5.bb
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.6.bb
Diffs:
#
# mt diff -rca79cbe803b8aa5bd6d3ebe944504e5af8234d59 -r59d9c0cd76234ed61c133780c90859a6eec60363
#
#
#
# delete "packages/binutils/binutils-cvs/binutils-100_cflags_for_build.patch"
#
# delete "packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-200-build_modules.patch"
#
# delete "packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-210-cflags.patch"
#
# delete "packages/binutils/binutils-cvs/binutils-2.15.91.0.1-uclibc-100-conf.patch"
#
# add_file "packages/binutils/binutils-cvs/110-arm-eabi-conf.patch"
# content [8e09b73459c127e091caa529ef5caa3ac70c04a2]
#
# add_file "packages/binutils/binutils-cvs/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch"
# content [e0a30885b4d82cb2b512d4a9241044cc8cdc768b]
#
# add_file "packages/binutils/binutils-cvs/binutils-uclibc-300-001_ld_makefile_patch.patch"
# content [412df6ebe7f2dadc38a3d68b9a74accd998e927b]
#
# add_file "packages/binutils/binutils-cvs/binutils-uclibc-300-006_better_file_error.patch"
# content [74aba67bda3813664cc7fa3182d68e8561ba8515]
#
# add_file "packages/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch"
# content [9fb1224ed588f35fac30d5fdb0a69713e51c3fa9]
#
# add_file "packages/binutils/binutils-cvs/build_fix.patch"
# content [4d1571a719c3f0ef9f1db58fab9462cf6e500a02]
#
# add_file "packages/fakeroot/fakeroot-native_1.7.1.bb"
# content [b0f258393b1eed924239b1e734ae13e7382375b4]
#
# add_file "packages/fakeroot/fakeroot_1.7.1.bb"
# content [8967e479fc4f576b1cc0fe2775a0d1641dad8ed4]
#
# add_file "packages/fakeroot/files/work-with-older-libtool.patch"
# content [b51afd443340d64ddb92bebd023c2ecc4b002d79]
#
# patch "conf/bitbake.conf"
# from [913268fdd4af9c8f090f039d3c1dfe172bb3b59f]
# to [6eb2dc8d0201f633066436d2ca7e95bb6959844f]
#
# patch "packages/binutils/binutils.inc"
# from [c23725cdeb2c1671e38e52298a6ec5fed05263e8]
# to [f448bed26fe1742f47791f2fa478603cc6c038b5]
#
# patch "packages/binutils/binutils_cvs.bb"
# from [0b544c7fcc03aa165c4543aca0be55d86eeae75e]
# to [6a4a5d296ebef18abfb49e106a5fccbe4cc04fc2]
#
# patch "packages/ncurses/ncurses.inc"
# from [da4a903e1de796a50285b8e65823d214d89d2ea9]
# to [689c6691a65c3ebf75e0f00795ee5f1ea3c348d0]
#
# patch "packages/ncurses/ncurses_5.4.bb"
# from [b3e5f45623a8c35ae179e1aa93ca97b484fe83a9]
# to [72e763fb5ea691972f152eeaf0b2df386fa086d8]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
# from [e74da1a7434039b13a4b9e1f9569d213d4d98bd9]
# to [809cbe097eaad9b02cd18f06c813355b274c5d5a]
#
============================================================
--- packages/binutils/binutils-cvs/110-arm-eabi-conf.patch 8e09b73459c127e091caa529ef5caa3ac70c04a2
+++ packages/binutils/binutils-cvs/110-arm-eabi-conf.patch 8e09b73459c127e091caa529ef5caa3ac70c04a2
@@ -0,0 +1,24 @@
+diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure
+--- binutils-2.16.91.0.7.orig/configure 2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure 2006-05-31 14:55:53.000000000 +0300
+@@ -1299,7 +1299,7 @@
+ arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ ;;
+- arm*-*-linux-gnueabi)
++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+ ;;
+diff -urN binutils-2.16.91.0.7.orig/configure.ac binutils-2.16.91.0.7/configure.ac
+--- binutils-2.16.91.0.7.orig/configure.ac 2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure.ac 2006-05-31 14:55:53.000000000 +0300
+@@ -497,7 +497,7 @@
+ arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ ;;
+- arm*-*-linux-gnueabi)
++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+ ;;
============================================================
--- packages/binutils/binutils-cvs/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch e0a30885b4d82cb2b512d4a9241044cc8cdc768b
+++ packages/binutils/binutils-cvs/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch e0a30885b4d82cb2b512d4a9241044cc8cdc768b
@@ -0,0 +1,39 @@
+# strip (and objcopy) fail to set the error code if there is no
+# output file name and the rename of the stripped (or copied) file
+# fails, yet the command fails to do anything. This fixes both
+# objcopy and strip.
+#
+# modification by bero: Ported to 2.16.91.0.6
+#
+#Signed-off-by: John Bowler <jbowler at acm.org>
+#Signed-off-by: Bernhard Rosenkraenzer <bero at arklinux.org>
+---
+# binutils/objcopy.c | 8 +++++---
+# 1 file changed, 5 insertions(+), 3 deletions(-)
+#
+Index: src/binutils/objcopy.c
+===================================================================
+--- src.orig/binutils/objcopy.c 2007-08-09 13:26:03.000000000 +0100
++++ src/binutils/objcopy.c 2007-08-09 16:36:12.000000000 +0100
+@@ -2787,8 +2787,9 @@ strip_main (int argc, char *argv[])
+ if (preserve_dates)
+ set_times (tmpname, &statbuf);
+ if (output_file != tmpname)
+- smart_rename (tmpname, output_file ? output_file : argv[i],
+- preserve_dates);
++ if (smart_rename (tmpname, output_file ? output_file : argv[i],
++ preserve_dates))
++ hold_status = 1;
+ status = hold_status;
+ }
+ else
+@@ -3411,7 +3412,8 @@ copy_main (int argc, char *argv[])
+ if (preserve_dates)
+ set_times (tmpname, &statbuf);
+ if (tmpname != output_filename)
+- smart_rename (tmpname, input_filename, preserve_dates);
++ if (smart_rename (tmpname, input_filename, preserve_dates))
++ status = 1;
+ }
+ else
+ unlink_if_ordinary (tmpname);
============================================================
--- packages/binutils/binutils-cvs/binutils-uclibc-300-001_ld_makefile_patch.patch 412df6ebe7f2dadc38a3d68b9a74accd998e927b
+++ packages/binutils/binutils-cvs/binutils-uclibc-300-001_ld_makefile_patch.patch 412df6ebe7f2dadc38a3d68b9a74accd998e927b
@@ -0,0 +1,50 @@
+#!/bin/sh -e
+## 001_ld_makefile_patch.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: correct where ld scripts are installed
+## DP: Author: Chris Chimelis <chris at debian.org>
+## DP: Upstream status: N/A
+## DP: Date: ??
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- binutils-2.16.91.0.1/ld/Makefile.am
++++ binutils-2.16.91.0.1/ld/Makefile.am
+@@ -20,7 +20,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- binutils-2.16.91.0.1/ld/Makefile.in
++++ binutils-2.16.91.0.1/ld/Makefile.in
+@@ -268,7 +268,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
============================================================
--- packages/binutils/binutils-cvs/binutils-uclibc-300-006_better_file_error.patch 74aba67bda3813664cc7fa3182d68e8561ba8515
+++ packages/binutils/binutils-cvs/binutils-uclibc-300-006_better_file_error.patch 74aba67bda3813664cc7fa3182d68e8561ba8515
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+## 006_better_file_error.dpatch by David Kimdon <dwhedon at gordian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Specify which filename is causing an error if the filename is a
+## DP: directory. (#45832)
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
+--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100
++++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100
+@@ -150,6 +150,13 @@
+ {
+ bfd *nbfd;
+ const bfd_target *target_vec;
++ struct stat s;
++
++ if (stat (filename, &s) == 0)
++ if (S_ISDIR(s.st_mode)) {
++ bfd_set_error (bfd_error_file_not_recognized);
++ return NULL;
++ }
+
+ nbfd = _bfd_new_bfd ();
+ if (nbfd == NULL)
============================================================
--- packages/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch 9fb1224ed588f35fac30d5fdb0a69713e51c3fa9
+++ packages/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch 9fb1224ed588f35fac30d5fdb0a69713e51c3fa9
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
+## DP: cases where -rpath isn't specified. (#151024)
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
+--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100
++++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100
+@@ -692,6 +692,8 @@
+ && command_line.rpath == NULL)
+ {
+ lib_path = (const char *) getenv ("LD_RUN_PATH");
++ if ((lib_path) && (strlen (lib_path) == 0))
++ lib_path = NULL;
+ if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ force))
+ break;
+@@ -871,6 +873,8 @@
+ rpath = command_line.rpath;
+ if (rpath == NULL)
+ rpath = (const char *) getenv ("LD_RUN_PATH");
++ if ((rpath) && (strlen (rpath) == 0))
++ rpath = NULL;
+ if (! (bfd_elf_size_dynamic_sections
+ (output_bfd, command_line.soname, rpath,
+ command_line.filter_shlib,
============================================================
--- packages/binutils/binutils-cvs/build_fix.patch 4d1571a719c3f0ef9f1db58fab9462cf6e500a02
+++ packages/binutils/binutils-cvs/build_fix.patch 4d1571a719c3f0ef9f1db58fab9462cf6e500a02
@@ -0,0 +1,16 @@
+---
+ libiberty/fopen_unlocked.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: src/libiberty/fopen_unlocked.c
+===================================================================
+--- src.orig/libiberty/fopen_unlocked.c 2007-08-09 20:12:13.000000000 +0100
++++ src/libiberty/fopen_unlocked.c 2007-08-09 20:12:21.000000000 +0100
+@@ -70,6 +70,7 @@ unchanged.
+ #endif
+ #include <stdio.h>
+ #ifdef HAVE_STDIO_EXT_H
++#include <sys/cdefs.h>
+ #include <stdio_ext.h>
+ #endif
+
============================================================
--- packages/fakeroot/fakeroot-native_1.7.1.bb b0f258393b1eed924239b1e734ae13e7382375b4
+++ packages/fakeroot/fakeroot-native_1.7.1.bb b0f258393b1eed924239b1e734ae13e7382375b4
@@ -0,0 +1,21 @@
+SECTION = "base"
+require fakeroot_${PV}.bb
+inherit native
+RDEPENDS="util-linux-native"
+
+SRC_URI += "file://fix-prefix.patch;patch=1 \
+ file://work-with-older-libtool.patch;patch=1"
+S = "${WORKDIR}/fakeroot-${PV}"
+
+EXTRA_OECONF = " --program-prefix="
+
+# Compatability for the rare systems not using or having SYSV
+python () {
+ if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0':
+ bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d)
+}
+
+do_stage_append () {
+ oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/
+}
+
============================================================
--- packages/fakeroot/fakeroot_1.7.1.bb 8967e479fc4f576b1cc0fe2775a0d1641dad8ed4
+++ packages/fakeroot/fakeroot_1.7.1.bb 8967e479fc4f576b1cc0fe2775a0d1641dad8ed4
@@ -0,0 +1,16 @@
+DESCRIPTION = "Gives a fake root environment"
+SECTION = "base"
+LICENSE = "GPL"
+# fakeroot needs getopt which is provided by the util-linux package
+RDEPENDS = "util-linux"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${PV}.tar.gz"
+
+inherit autotools
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/fakeroot
+ install -m 644 *.h ${STAGING_INCDIR}/fakeroot
+ autotools_stage_all
+}
============================================================
--- packages/fakeroot/files/work-with-older-libtool.patch b51afd443340d64ddb92bebd023c2ecc4b002d79
+++ packages/fakeroot/files/work-with-older-libtool.patch b51afd443340d64ddb92bebd023c2ecc4b002d79
@@ -0,0 +1,11 @@
+--- fakeroot-1.7.1/configure.ac.orig 2007-08-09 16:03:34.000000000 -0500
++++ fakeroot-1.7.1/configure.ac 2007-08-09 18:26:11.000000000 -0500
+@@ -7,8 +7,6 @@
+ AC_CONFIG_HEADERS([config.h])
+ AC_PROG_MAKE_SET
+ AM_PROG_LIBTOOL
+-LT_INIT
+-LT_LANG(C)
+
+ AC_ARG_WITH([ipc],
+ AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],
============================================================
--- conf/bitbake.conf 913268fdd4af9c8f090f039d3c1dfe172bb3b59f
+++ conf/bitbake.conf 6eb2dc8d0201f633066436d2ca7e95bb6959844f
@@ -168,6 +168,7 @@ STAGING_LIBDIR = "${STAGING_DIR}/${HOST_
STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
+STAGING_LIBDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/lib"
STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"
============================================================
--- packages/binutils/binutils.inc c23725cdeb2c1671e38e52298a6ec5fed05263e8
+++ packages/binutils/binutils.inc f448bed26fe1742f47791f2fa478603cc6c038b5
@@ -56,14 +56,14 @@ export RANLIB_FOR_TARGET = "${TARGET_PRE
export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
-export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
export CC_FOR_BUILD = "${BUILD_CC}"
export CPP_FOR_BUILD = "${BUILD_CPP}"
export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
-export CC = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
do_configure () {
(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
============================================================
--- packages/binutils/binutils_cvs.bb 0b544c7fcc03aa165c4543aca0be55d86eeae75e
+++ packages/binutils/binutils_cvs.bb 6a4a5d296ebef18abfb49e106a5fccbe4cc04fc2
@@ -1,121 +1,18 @@
-SECTION = "devel"
-inherit autotools gettext
-
-DESCRIPTION = "A GNU collection of binary utilities"
-HOMEPAGE = "http://www.gnu.org/softwar%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rfc9df3f6bc3d16669463fde20e46e8b5a683ad84 -r59d9c0cd76234ed61c133780c90859a6eec60363
#
#
#
# delete "packages/pulseaudio/pulseaudio_0.9.5.bb"
#
# patch "packages/pulseaudio/pulse.inc"
# from [f89af52f87198178c40491617e535f1bf63aa6e5]
# to [13e5ed16850df498fa03cf93e6186cb21597298a]
#
# patch "packages/pulseaudio/pulseaudio_0.9.6.bb"
# from [5fd2aeb06e04c45caebb9f24c26dc6c080630be7]
# to [277e19b6004bf26e9850276af07b6fe9c4b53ab0]
#
============================================================
--- packages/pulseaudio/pulse.inc f89af52f87198178c40491617e535f1bf63aa6e5
+++ packages/pulseaudio/pulse.inc 13e5ed16850df498fa03cf93e6186cb21597298a
@@ -65,28 +65,25 @@ CONFFILES_pulseaudio-server = "\
FILES_${PN}-misc = "${bindir}/*"
CONFFILES_pulseaudio-server = "\
- ${sysconfdir}/pulse/default.pa \
- ${sysconfdir}/pulse/daemon.conf \
- ${sysconfdir}/pulse/client.conf \
- "
-pkg_postinst_libppulse() {
-if test "x$D" != "x"; then
- exit 1
-else
+ ${sysconfdir}/pulse/default.pa \
+ ${sysconfdir}/pulse/daemon.conf \
+ ${sysconfdir}/pulse/client.conf \
+ "
+
+pkg_postinst_${PN}-server() {
+ # can't do this offline
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
grep -q pulse: /etc/group || addgroup pulse
grep -q pulse: /etc/passwd || \
adduser --disabled-password --home=/var/run/pulse/ --system \
--ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
/etc/init.d/populate-volatile.sh update
-fi
}
-pkg_postrm_libpulse() {
-if test "x$D" != "x"; then
- exit 1
-else
- deluser pulse
-fi
+pkg_postrm_${PN}-server() {
+ deluser pulse || true
}
python populate_packages_prepend() {
============================================================
--- packages/pulseaudio/pulseaudio_0.9.6.bb 5fd2aeb06e04c45caebb9f24c26dc6c080630be7
+++ packages/pulseaudio/pulseaudio_0.9.6.bb 277e19b6004bf26e9850276af07b6fe9c4b53ab0
@@ -1,4 +1,4 @@ require pulse.inc
require pulse.inc
-PR = "r3"
+PR = "r4"
More information about the Openembedded-commits
mailing list