CompuExtreme/ViitorMake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: dbus config kommt jetzt nach /etc/sysconfig/dbus-1 und nicht mehr nach

Browse Source 
/etc/sysconfig/dbus/dbus-1...




git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4958 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2009-12-23 12:35:23 +00:00
parent 9b29c82d0b
commit a682440c81
11 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SysBuild/development/mono
View File

@ -78,7 +78,8 @@ premk() {
mk() {
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
./configure --prefix=/usr
./configure --prefix=/usr \
--sysconfdir=/etc/sysconfig
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
}

4
SysBuild/gnome/gnome-settings-daemon
View File

@ -88,7 +88,7 @@ mk32() {
--libexecdir=/opt/gnome/lib/gnome-settings-daemon \
--sysconfdir=/etc/gnome \
--localstatedir=/var/lib \
--with-dbus-sys=/etc/sysconfig/dbus/dbus-1/system.d &&
--with-dbus-sys=/etc/sysconfig/dbus-1/system.d &&
make -k -j $NUMCPU
make -k DESTDIR=$TMPROOT install
cd ../gnome-settings-daemon*
@ -109,7 +109,7 @@ mk() {
--libexecdir=/opt/gnome/$LIBDIR/gnome-settings-daemon \
--sysconfdir=/etc/gnome \
--localstatedir=/var/lib \
--with-dbus-sys=/etc/sysconfig/dbus/dbus-1/system.d &&
--with-dbus-sys=/etc/sysconfig/dbus-1/system.d &&
make -j $NUMCPU
make DESTDIR=$TMPROOT install
}

8
SysBuild/tools/ConsoleKit
View File

@ -84,7 +84,7 @@ mk32() {
USE_ARCH=$UARCH \
CPPFLAGS="-I/usr/X11R7/include" \
../ConsoleKit*/configure --target=$TARGET32 \
--prefix=/usr
--prefix=/usr \
--sysconfdir=/etc/sysconfig \
--localstatedir=/var \
--libexecdir=/usr/lib/ConsleKit \
@ -116,12 +116,6 @@ mk() {
postmk() {
cd ../ConsoleKit*
if [ ! -d $TMPROOT/etc/sysconfig/dbus ]; then
mkdir $TMPROOT/etc/sysconfig/dbus
fi
if [ -d $TMPROOT/etc/sysconfig/dbus-1 ]; then
mv $TMPROOT/etc/sysconfig/dbus-1 $TMPROOT/etc/sysconfig/dbus/
fi
rm -r ../Build-ConsoleKit
mv $TMPROOT/usr/share/dbus-1/system-services $TMPROOT/usr/share/dbus-1/services
}

7
SysBuild/tools/DeviceKit
View File

@ -81,7 +81,8 @@ mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=32 \
./configure --prefix=/usr
./configure --prefix=/usr \
--sysconfdir=/etc/sysconfig
make -j $NUMCPU -k
make -j $NUMCPU -k DESTDIR=$TMPROOT install
make distclean
@ -95,11 +96,13 @@ mk() {
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure $ADDOPTIONS \
--prefix=/usr
--prefix=/usr \
--sysconfdir=/etc/sysconfig
make -j $NUMCPU -k
make -j $NUMCPU -k DESTDIR=$TMPROOT install
}
postmk() {
mv $TMPROOT/etc/sysconfig/udev $TMPROOT/etc
mv $TMPROOT/usr/share/dbus-1/system-services $TMPROOT/usr/share/dbus-1/services
}

5
SysBuild/tools/PolicyKit
View File

@ -125,11 +125,6 @@ mk() {
postmk() {
mv -v $TMPROOT/etc/sysconfig/pam.d $TMPROOT/etc
if [ ! -d $TMPROOT/etc/sysconfig/dbus ]; then
mkdir -p $TMPROOT/etc/sysconfig/dbus
fi
mv -v $TMPROOT/etc/sysconfig/dbus-1 $TMPROOT/etc/sysconfig/dbus/
rm -f $TMPROOT/etc/sysconfig/dbus-1
sed -i -e "s/\(<\/config\>\)/\<match action=\"org.freedesktop.hal.storage.mount-removeable\"\>\n\<return result=\"yes\" \\\>\n\1/" $TMPROOT/etc/sysconfig/PolicyKit/PolicyKit.conf
GetSVN Viitor_PolicyKit $TMPROOT
mv $TMPROOT/usr/share/dbus-1/system-services $TMPROOT/usr/share/dbus-1/services

2
SysBuild/tools/bluez-utils
View File

@ -115,8 +115,6 @@ mk() {
postmk() {
cd $TMPROOT/etc/sysconfig
mkdir dbus
mv dbus-1 dbus/
mv init.d ../
mv udev ../
cd -

4
SysBuild/tools/cups
View File

@ -134,6 +134,6 @@ postmk() {
fi
rm -r $TMPROOT/etc/init.d
GetSVN Viitor_cups $TMPROOT
mkdir -p $TMPROOT/etc/sysconfig/dbus/dbus-1/system.d
mv /etc/sysconfig/dbus/dbus-1/system.d/cups.conf $TMPROOT/etc/sysconfig/dbus/dbus-1/system.d
mkdir -p $TMPROOT/etc/sysconfig/dbus-1/system.d
mv /etc/sysconfig/dbus-1/system.d/cups.conf $TMPROOT/etc/sysconfig/dbus-1/system.d
}

6
SysBuild/tools/dbus
View File

@ -86,7 +86,7 @@ mk32() {
CC="gcc ${BUILDOPTIONS32}" USE_ARCH=$UARCH \
LDFLAGS="-L/usr/X11R7/lib" \
../dbus*/configure --prefix=/usr \
--sysconfdir=/etc/sysconfig/dbus \
--sysconfdir=/etc/sysconfig \
--libexecdir=/usr/lib/dbus-1.0 \
--localstatedir=/var &&
make -j $NUMCPU &&
@ -105,7 +105,7 @@ mk() {
CC="gcc $BUILDOPTIONS" USE_ARCH=$UARCH \
../dbus*/configure --prefix=/usr \
$ADDOPTIONS \
--sysconfdir=/etc/sysconfig/dbus \
--sysconfdir=/etc/sysconfig \
--libexecdir=/usr/$LIBDIR/dbus-1.0 \
--localstatedir=/var &&
make -j $NUMCPU &&
@ -118,6 +118,6 @@ postmk() {
rm -r ../Build-dbus
ClearHostSysNameing $TMPROOT
GetSVN Viitor_dbus $TMPROOT
cd $TMPROOT/etc/sysconfig/dbus/dbus-1
cd $TMPROOT/etc/sysconfig/dbus-1
sed -i "/<standard_session_servicedirs \/>/a\ <servicedir>/usr/share/dbus-1/services</servicedir>" session.conf
}

4
SysBuild/tools/hal
View File

@ -128,8 +128,8 @@ mk() {
postmk() {
cd $TMPROOT
mkdir -p etc/sysconfig/dbus
mv etc/dbus-1 etc/sysconfig/dbus
mkdir -p etc/sysconfig
mv etc/dbus-1 etc/sysconfig
cd -
GetSVN Viitor_hald $TMPROOT
}

7
SysBuild/tools/plugz
View File

@ -110,10 +110,5 @@ mk() {
}
postmk() {
if [ ! -d $TMPROOT/etc/sysconfig/dbus ]; then
mkdir -p $TMPROOT/etc/sysconfig/dbus
fi
if [ -d $TMPROOT/etc/sysconfig/dbus-1 ]; then
mv $TMPROOT/etc/sysconfig/dbus-1 $TMPROOT/etc/sysconfig/dbus/
fi
echo "Nothing to do for postmk()"
}

3
SysBuild/tools/polkit
View File

@ -82,6 +82,7 @@ mk32() {
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=32 \
./configure --prefix=/usr \
--sysconfdir=/etc/sysconfig \
--libexecdir=/usr/lib/polkit
find . -name "Makefile" -exec sed -i "s/lib64/lib/g" {} \;
make -j $NUMCPU -k
@ -99,6 +100,7 @@ mk() {
USE_ARCH=$UARCH \
./configure $ADDOPTIONS \
--prefix=/usr \
--sysconfdir=/etc/sysconfig \
--libexecdir=/usr/$LIBDIR/polkit
make -j $NUMCPU -k
make -j $NUMCPU -k install
@ -106,5 +108,6 @@ mk() {
}
postmk() {
mv $TMPROOT/etc/sysconfig/pam.d $TMPROOT/etc
mv $TMPROOT/usr/share/dbus-1/system-services $TMPROOT/usr/share/dbus-1/services
}