Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 18 years ago
parent
commit
0df26b88a3
4 changed files with 62 additions and 2 deletions
  1. +17
    -0
      package/base/hal/dont-install-fdis.patch
  2. +42
    -0
      package/base/hal/fix-build-without-libpci.patch
  3. +2
    -1
      package/base/hal/hal.conf
  4. +1
    -1
      package/base/parted/parted.desc

+ 17
- 0
package/base/hal/dont-install-fdis.patch

@ -0,0 +1,17 @@
--- hal-0.5.8.1/fdi/information/10freedesktop/Makefile.in~ 2006-09-19 22:24:36.000000000 +0200
+++ hal-0.5.8.1/fdi/information/10freedesktop/Makefile.in 2006-12-30 20:03:41.000000000 +0100
@@ -282,13 +282,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
fdidir = $(datadir)/hal/fdi/information/10freedesktop
-dist_fdi_DATA = 10-usb-card-readers.fdi \
- 10-usb-music-players.fdi \
- 10-usb-zip-drives.fdi \
- 10-wireless-mice.fdi \
- 10-camera-ptp.fdi \
- 10-usb-pda.fdi \
- 10-cd-dvd-burner.fdi
+dist_fdi_DATA = 10-wireless-mice.fdi
all: all-am

+ 42
- 0
package/base/hal/fix-build-without-libpci.patch

@ -0,0 +1,42 @@
diff -dur hal-0.5.8.1/configure hal-0.5.8.1-p/configure
--- hal-0.5.8.1/configure 2006-09-19 22:24:41.000000000 +0200
+++ hal-0.5.8.1-p/configure 2006-12-30 13:49:17.000000000 +0100
@@ -22383,10 +22383,10 @@
fi;
BUILD_MACBOOKPRO=no
-if test "x$use_macbookpro" = "xyes" ; then
+if test "x$with_macbookpro" = "xyes" ; then
BUILD_MACBOOKPRO=yes
-elif test "x$use_macbookpro" = "x" ; then
- if test "$HAVE_LIBPCI" != "false" ; then
+elif test "x$with_macbookpro" = "x" ; then
+ if test "x$HAVE_LIBPCI_TRUE" != "x#" ; then
case "${host}" in
i[3456]86-*-linux*)
BUILD_MACBOOKPRO=yes
@@ -22397,7 +22397,6 @@
fi
fi
-
if test x$BUILD_MACBOOKPRO = xyes; then
BUILD_MACBOOKPRO_TRUE=
BUILD_MACBOOKPRO_FALSE='#'
diff -dur hal-0.5.8.1/configure.in hal-0.5.8.1-p/configure.in
--- hal-0.5.8.1/configure.in 2006-09-19 22:24:05.000000000 +0200
+++ hal-0.5.8.1-p/configure.in 2006-12-30 13:49:06.000000000 +0100
@@ -250,10 +250,10 @@
dnl see if we should build macbookpro utils
AC_ARG_WITH(macbookpro, [ --with-macbookpro Whether to build Macbook Pro utils (auto)])
BUILD_MACBOOKPRO=no
-if test "x$use_macbookpro" = "xyes" ; then
+if test "x$with_macbookpro" = "xyes" ; then
BUILD_MACBOOKPRO=yes
-elif test "x$use_macbookpro" = "x" ; then
- if test "$HAVE_LIBPCI" != "false" ; then
+elif test "x$with_macbookpro" = "x" ; then
+ if test "x$HAVE_LIBPCI_TRUE" != "x#" ; then
case "${host}" in
i[[3456]]86-*-linux*)
BUILD_MACBOOKPRO=yes

+ 2
- 1
package/base/hal/hal.conf

@ -20,7 +20,8 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
var_append confopt " " "--enable-verbose-mode"
var_append extraconfopt " " "--enable-verbose-mode"
hook_add postmake 3 "install_init hal $confdir/hal.init"
# are these still needed without fstab sync?

+ 1
- 1
package/base/parted/parted.desc

@ -40,7 +40,7 @@
[L] GPL
[S] Stable
[V] 1.6.25.1
[P] X -?-3-----9 222.600
[P] X -?-3-----9 140.000
[D] 2450491506 parted-1.6.25.1.tar.gz http://ftp.gnu.org/gnu/parted/

Loading…
Cancel
Save