On Thu, May 02, 2013 at 05:40:59PM +0200, Ren? Rebe wrote:
> Hi,
>
> sorry, I never got used to git, too complicated etc, ? can you post a patch
> here to review?
>
patch attach
>From c7079174b0d9e0141a9e098981389850d41bc119 Mon Sep 17 00:00:00 2001
From: Gerardo Di Iorio <[email protected]>
Date: Fri, 26 Apr 2013 15:25:52 +0200
Subject: [PATCH 1/5] * update acl 2.2.47 -> 2.2.51
---
package/base/acl/acl.conf | 5 +++--
package/base/acl/acl.desc | 8 ++++----
package/base/acl/no-links.patch | 45 -----------------------------------------
3 files changed, 7 insertions(+), 51 deletions(-)
delete mode 100644 package/base/acl/no-links.patch
diff --git a/package/base/acl/acl.conf b/package/base/acl/acl.conf
index 9933cc2..ea8324b 100644
--- a/package/base/acl/acl.conf
+++ b/package/base/acl/acl.conf
@@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../acl/acl.conf
-# Copyright (C) 2004 - 2007 The T2 SDE Project
+# Copyright (C) 2004 - 2013 The T2 SDE Project
# Copyright (C) 1998 - 2003 ROCK Linux Project
#
# More information can be found in the files COPYING and README.
@@ -15,8 +15,9 @@
# do not try to detect rpm
export RPM=/no
+export INSTALL_USER=root INSTALL_GROUP=root
-# adjust libdir
+ #adjust libdir
libdir="/${libdir##*/}"
# also install headers and libs
diff --git a/package/base/acl/acl.desc b/package/base/acl/acl.desc
index a6a17e1..c87a2ea 100644
--- a/package/base/acl/acl.desc
+++ b/package/base/acl/acl.desc
@@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] T2 SDE: package/.../acl/acl.desc
-[COPY] Copyright (C) 2004 - 2009 The T2 SDE Project
+[COPY] Copyright (C) 2004 - 2013 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 ROCK Linux Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
@@ -30,7 +30,7 @@
[L] GPL
[S] Stable
-[V] 2.2.47
-[P] X -1---5---9 105.300
+[V] 2.2.51
+[P] X -----5---9 105.300
-[D] 2779578555 acl_2.2.47-1.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/
+[D] 933212680 acl-2.2.51.src.tar.gz
http://download.savannah.gnu.org/releases/acl
diff --git a/package/base/acl/no-links.patch b/package/base/acl/no-links.patch
deleted file mode 100644
index b9bebc4..0000000
--- a/package/base/acl/no-links.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../acl/no-links.patch
-# Copyright (C) 2006 - 2007 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-
-Don't create these links, this hurts our .la,.a file handling,
-but create a normal /lib/libacl.so link.
- -- jsaw
-
---- ./include/buildmacros.orig 2006-06-20 08:51:25.000000000 +0200
-+++ ./include/buildmacros 2007-01-17 15:16:36.000000000 +0100
-@@ -56,7 +56,8 @@
- cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
-+ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR); \
-+ ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR)
- endif
-
- # Libtool thinks the static and shared libs should be in the same dir, so
-@@ -72,10 +73,7 @@
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a
$(PKG_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la
$(PKG_LIB_DIR)/$(LIBNAME).la; \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so
$(PKG_DEVLIB_DIR)/$(LIBNAME).so
-+ ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR);
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
--
1.8.2
>From 5024bb11b67786835f20874336ca8bda7d32060c Mon Sep 17 00:00:00 2001
From: Gerardo Di Iorio <[email protected]>
Date: Thu, 2 May 2013 12:02:25 +0200
Subject: [PATCH 2/5] * update attr 2.4.43 -> 2.4.46
---
package/base/attr/attr.conf | 4 +--
package/base/attr/attr.desc | 9 +++---
package/base/attr/destdir.patch | 41 ---------------------------
package/base/attr/install-instead-cp.patch | 27 ------------------
package/base/attr/no-links.patch | 45 ------------------------------
5 files changed, 7 insertions(+), 119 deletions(-)
delete mode 100644 package/base/attr/destdir.patch
delete mode 100644 package/base/attr/install-instead-cp.patch
delete mode 100644 package/base/attr/no-links.patch
diff --git a/package/base/attr/attr.conf b/package/base/attr/attr.conf
index a9b86f9..208246e 100644
--- a/package/base/attr/attr.conf
+++ b/package/base/attr/attr.conf
@@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../attr/attr.conf
-# Copyright (C) 2004 - 2007 The T2 SDE Project
+# Copyright (C) 2004 - 2013 The T2 SDE Project
# Copyright (C) 1998 - 2003 ROCK Linux Project
#
# More information can be found in the files COPYING and README.
@@ -15,7 +15,7 @@
# adjust paths
libdir="/${libdir##*/}"
-
+export INSTALL_USER=root INSTALL_GROUP=root
# also install headers and libs
makeinstopt="$makeinstopt install-lib install-dev"
diff --git a/package/base/attr/attr.desc b/package/base/attr/attr.desc
index 4e9c695..4c455e5 100644
--- a/package/base/attr/attr.desc
+++ b/package/base/attr/attr.desc
@@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] T2 SDE: package/.../attr/attr.desc
-[COPY] Copyright (C) 2004 - 2009 The T2 SDE Project
+[COPY] Copyright (C) 2004 - 2013 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 ROCK Linux Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
@@ -39,7 +39,8 @@
[L] GPL
[S] Stable
-[V] 2.4.43
-[P] X -1---5---9 105.299
+[V] 2.4.46
+[P] X -----5---9 105.299
-[D] 833204407 attr_2.4.43-1.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/
+[D] 2740599464 attr-2.4.46.src.tar.gz
http://download.savannah.gnu.org/releases/
+attr/
diff --git a/package/base/attr/destdir.patch b/package/base/attr/destdir.patch
deleted file mode 100644
index e80227f..0000000
--- a/package/base/attr/destdir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../attr/destdir.patch
-# Copyright (C) 2007 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-
---- ./include/builddefs.in.orig 2006-06-20 08:51:25.000000000 +0200
-+++ ./include/builddefs.in 2007-01-17 14:47:10.000000000 +0100
-@@ -25,14 +25,14 @@
- PKG_VERSION = @pkg_version@
- PKG_PLATFORM = @pkg_platform@
- PKG_DISTRIBUTION= @pkg_distribution@
--PKG_BIN_DIR = @bindir@
--PKG_SBIN_DIR = @sbindir@
--PKG_LIB_DIR = @libdir@@libdirsuffix@
--PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@
--PKG_INC_DIR = @includedir@/attr
--PKG_MAN_DIR = @mandir@
--PKG_DOC_DIR = @datadir@/doc/@pkg_name@
--PKG_LOCALE_DIR = @datadir@/locale
-+PKG_BIN_DIR = $(DESTDIR)@bindir@
-+PKG_SBIN_DIR = $(DESTDIR)@sbindir@
-+PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@
-+PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@
-+PKG_INC_DIR = $(DESTDIR)@includedir@/attr
-+PKG_MAN_DIR = $(DESTDIR)@mandir@
-+PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@
-+PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale
-
- CC = @cc@
- AWK = @awk@
diff --git a/package/base/attr/install-instead-cp.patch
b/package/base/attr/install-instead-cp.patch
deleted file mode 100644
index 2367e4e..0000000
--- a/package/base/attr/install-instead-cp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../attr/install-instead-cp.patch
-# Copyright (C) 2009 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-
---- ./install-sh.orig 2009-08-19 12:31:00.000000000 +0200
-+++ ./install-sh 2009-08-19 12:34:22.000000000 +0200
-@@ -92,7 +92,7 @@
-
- if $INSTALL
- then
-- CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown
-+ CP=install; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown
- else
- CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true
- fi
diff --git a/package/base/attr/no-links.patch b/package/base/attr/no-links.patch
deleted file mode 100644
index f50cbcd..0000000
--- a/package/base/attr/no-links.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../attr/no-links.patch
-# Copyright (C) 2006 - 2007 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-
-Don't create these links, this hurts our .la,.a file handling,
-but create a normal /lib/libattr.so link.
- -- jsaw
-
---- ./include/buildmacros.orig 2006-06-20 08:51:25.000000000 +0200
-+++ ./include/buildmacros 2007-01-17 15:01:45.000000000 +0100
-@@ -56,7 +56,8 @@
- cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
-+ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR); \
-+ ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR)
- endif
-
- # Libtool thinks the static and shared libs should be in the same dir, so
-@@ -72,10 +73,7 @@
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a
$(PKG_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la
$(PKG_LIB_DIR)/$(LIBNAME).la; \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so
$(PKG_DEVLIB_DIR)/$(LIBNAME).so
-+ ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR);
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
--
1.8.2
>From 32fea23148a5f2490aabe1b2c7646c8d9117c64b Mon Sep 17 00:00:00 2001
From: Gerardo Di Iorio <[email protected]>
Date: Thu, 2 May 2013 11:56:00 +0200
Subject: [PATCH 3/5] * pciutils build before udev
---
package/base/pciutils/pciutils.desc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/base/pciutils/pciutils.desc
b/package/base/pciutils/pciutils.desc
index a0dbeb6..e445677 100644
--- a/package/base/pciutils/pciutils.desc
+++ b/package/base/pciutils/pciutils.desc
@@ -29,7 +29,7 @@
[L] GPL
[S] Stable
[V] 3.2.0
-[P] X -----5---9 149.900
+[P] X -----5---9 126.900
[D] 2506315556 pciutils-3.2.0.tar.gz
ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/
[D] 2645325796 pci.ids-2009-02-01.bz2
!http://pciids.sourceforge.net/pci.ids.bz2
--
1.8.2
>From fb30984be33b98d6b2f6a8b75cee1184faca2eea Mon Sep 17 00:00:00 2001
From: Gerardo Di Iorio <[email protected]>
Date: Thu, 2 May 2013 11:56:40 +0200
Subject: [PATCH 4/5] * usbutils build before udev
---
package/base/usbutils/usbutils.desc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/base/usbutils/usbutils.desc
b/package/base/usbutils/usbutils.desc
index a49d133..eb3a39e 100644
--- a/package/base/usbutils/usbutils.desc
+++ b/package/base/usbutils/usbutils.desc
@@ -32,6 +32,6 @@
[L] GPL
[S] Stable
[V] 6
-[P] X -----5---9 149.000
+[P] X -----5---9 126.000
[D] 1668515474 usbutils-006.tar.gz
http://www.kernel.org/pub/linux/utils/usb/usbutils/
--
1.8.2
>From 751ca66f466b71c79538018b1b89a97aee9ae19a Mon Sep 17 00:00:00 2001
From: Gerardo Di Iorio <[email protected]>
Date: Fri, 26 Apr 2013 17:15:23 +0200
Subject: [PATCH 5/5] * udev enable extras and gudev
Conflicts:
package/base/linux/linux.desc
---
package/base/dietlibc/parse-config-9 | 2 ++
package/base/linux/linux.desc | 2 +-
package/filesystem/udev/udev.conf | 13 ++++++++++++-
package/filesystem/udev/udev.desc | 4 ++--
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/package/base/dietlibc/parse-config-9
b/package/base/dietlibc/parse-config-9
index 5d65aac..304bb1f 100644
--- a/package/base/dietlibc/parse-config-9
+++ b/package/base/dietlibc/parse-config-9
@@ -78,6 +78,8 @@ if [ "$SDECFG_LIBC" != "dietlibc" -a "$pkg_dietlibc_useit" =
1 ]; then
echo_status "Second pass, linking against dietlibc, ..."
rm -vf config.cache
var_append extraconfopt ' ' '--enable-shared=no'
+ var_remove confopt ' ' '--enable-extras'
+ var_append confopt ' ' '--disable-extras'
fi
;;
esac
diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc
index e71aba3..a80843f 100644
--- a/package/base/linux/linux.desc
+++ b/package/base/linux/linux.desc
@@ -30,7 +30,7 @@
[L] GPL
[S] Stable
[V] 3.8.11
-[P] X -----5---9 102.360
+[P] X -----5---9 127.100
[SRC] linux-
[D] 3091263600 linux-3.8.tar.bz2 http://www.kernel.org/pub/linux/kernel/v3.0/
diff --git a/package/filesystem/udev/udev.conf
b/package/filesystem/udev/udev.conf
index b585c04..eb9fc76 100644
--- a/package/filesystem/udev/udev.conf
+++ b/package/filesystem/udev/udev.conf
@@ -38,7 +38,18 @@ udev_pm(){
[ $SDECFG_PKG_UDEV_DEVDIR ] || SDECFG_PKG_UDEV_DEVDIR=/dev
-var_append confopt " " "--disable-extras --disable-introspection
--libexecdir=/lib/udev" # $libdir?
+if pkginstalled gobject-introspection; then
+ var_append confopt " " " --enable-introspection"
+else
+ var_append confopt " " " --disable-introspection"
+fi
+if pkginstalled attr && pkginstalled acl && pkginstalled libusb-compat
;then
+ var_append confopt " " " --enable-extras"
+else
+ var_append confopt " " " --disable-extras"
+fi
+
+var_append confopt " " "--libexecdir=/lib /udev" # $libdir?
var_append makeopt " " "LD=$CC LDFLAGS= udevdir=$SDECFG_PKG_UDEV_DEVDIR"
var_append makeopt " " 'EXTRAS="$uxp" prefix='
var_append makeinstopt " " "LD=$CC LDFLAGS= udevdir=$SDECFG_PKG_UDEV_DEVDIR"
diff --git a/package/filesystem/udev/udev.desc
b/package/filesystem/udev/udev.desc
index dde71dc..9e27bd5 100644
--- a/package/filesystem/udev/udev.desc
+++ b/package/filesystem/udev/udev.desc
@@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] T2 SDE: package/.../udev/udev.desc
-[COPY] Copyright (C) 2004 - 2011 The T2 SDE Project
+[COPY] Copyright (C) 2004 - 2013 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 ROCK Linux Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
@@ -31,6 +31,6 @@
[L] GPL
[S] Beta
[V] 167
-[P] X -1---5---9 102.030
+[P] X -----5---9 127.000
[D] 911694724 udev-167.tar.bz2
http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
--
1.8.2
-----------------------------------------------------------
If you wish to unsubscribe from this mailing, send mail to
[email protected] with a subject of: unsubscribe t2
