Author: pebender
Date: Thu May 14 14:06:02 2009
New Revision: 4763
Added:
trunk/gar-minimyth/script/lib/libuuid/ (props changed)
trunk/gar-minimyth/script/lib/libuuid/Makefile
trunk/gar-minimyth/script/lib/libuuid/checksums
trunk/gar-minimyth/script/utils/util-linux-ng/files/
trunk/gar-minimyth/script/utils/util-linux-ng/files/util-linux-ng-2.15-blkid.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/disk/e2fsprogs/Makefile
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-disk.rules
trunk/gar-minimyth/script/utils/util-linux-ng/Makefile
trunk/gar-minimyth/script/utils/util-linux-ng/checksums
Log:
- Modified udev scripts so that they use the new blkid rather than the
obsoleted vol_id.
- Added package lib/libuuid.
- Updated package utils-util-linux-ng.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Thu May 14
14:06:02 2009
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 66 (2009-05-13):
+Changes since 66 (2009-05-14):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082 and
@@ -59,6 +59,10 @@
Modified mediaplayers
- Modified mplayer-vld so that it uses the system liba52.
+Modified udev
+ - Modified udev scripts so that they use the new blkid rather than the
+ obsoleted vol_id.
+
Modified kernel
- Added dvb-usb-dib0700 related drivers.
- Added ext2 driver.
@@ -87,6 +91,7 @@
Removed nvidia/nvidia-180.44.
Added packages
+ Added lib/libuuid.
Added nvidia/nvidia-180.51.
Added nvidia/nvidia-185.18.08.
Added system/irclient.
@@ -146,6 +151,7 @@
Updated utils/squashfs-4.0.
Updated utils/unzip.
Updated utils/usbutils.
+ Updated utils/util-linux-ng.
Updated X11/ratpoison.
Updated X11/vdpau.
Updated xorg-7.3/dri2proto.
Modified: trunk/gar-minimyth/script/disk/e2fsprogs/Makefile
==============================================================================
--- trunk/gar-minimyth/script/disk/e2fsprogs/Makefile (original)
+++ trunk/gar-minimyth/script/disk/e2fsprogs/Makefile Thu May 14 14:06:02
2009
@@ -10,7 +10,7 @@
define BLURB
endef
-DEPENDS = lang/c
+DEPENDS = lang/c utils/util-linux-ng
CONFIGURE_SCRIPTS = $(WORKSRC)/configure
BUILD_SCRIPTS = $(WORKSRC)/Makefile
@@ -19,6 +19,7 @@
CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
--disable-rpath \
--enable-elf-shlibs \
+ --disable-libblkid \
--with-gnu-ld
include ../../gar.mk
@@ -32,12 +33,10 @@
@$(MAKECOOKIE)
post-install:
- @rm -f $(DESTDIR)$(libdir)/libblkid.a
@rm -f $(DESTDIR)$(libdir)/libcom_err.a
@rm -f $(DESTDIR)$(libdir)/libe2p.a
@rm -f $(DESTDIR)$(libdir)/libext2fs.a
@rm -f $(DESTDIR)$(libdir)/libss.a
@rm -f $(DESTDIR)$(libdir)/libuuid.a
- @mv -f $(DESTDIR)$(libdir)/libblkid.* $(DESTDIR)$(elibdir)/
@mv -f $(DESTDIR)$(libdir)/libuuid.* $(DESTDIR)$(elibdir)/
@$(MAKECOOKIE)
Added: trunk/gar-minimyth/script/lib/libuuid/Makefile
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/lib/libuuid/Makefile Thu May 14 14:06:02 2009
@@ -0,0 +1,37 @@
+GARNAME = libuuid
+GARVERSION = 1.41.5
+CATEGORIES = lib
+SOURCEPKG = disk/e2fsprogs
+LICENSE = GPL2/LGPL2
+
+DESCRIPTION =
+define BLURB
+endef
+
+DEPENDS = lang/c
+
+WORKSRC = $(WORKDIR)/e2fsprogs-$(GARVERSION)
+
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+BUILD_SCRIPTS = $(WORKSRC)/lib/uuid/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/lib/uuid/Makefile
+
+CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
+ --disable-rpath \
+ --enable-elf-shlibs \
+ --with-gnu-ld
+
+include ../../gar.mk
+
+pre-configure:
+ @$(call FIX_LIBTOOL_LIBPATH,$(WORKSRC),configure)
+ @$(MAKECOOKIE)
+
+install-custom:
+ @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach
TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(WORKSRC)
$(INSTALL_ARGS) install install-libs
+ @$(MAKECOOKIE)
+
+post-install:
+ @rm -f $(DESTDIR)$(libdir)/libuuid.a
+ @mv -f $(DESTDIR)$(libdir)/libuuid.* $(DESTDIR)$(elibdir)/
+ @$(MAKECOOKIE)
Added: trunk/gar-minimyth/script/lib/libuuid/checksums
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/lib/libuuid/checksums Thu May 14 14:06:02 2009
@@ -0,0 +1 @@
+e218df6c84fc17c1126d31de9472a76c download/e2fsprogs-1.41.5.tar.gz
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
Thu May 14 14:06:02 2009
@@ -2,6 +2,7 @@
agetty
alsactl
amixer
+blkid
cvt
curl
depmod
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
Thu May 14 14:06:02 2009
@@ -9,7 +9,6 @@
libthread_db.so.1
mythtv/filters/
udev/cdrom_id
-udev/vol_id
# iconv
gconv/gconv-modules
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-disk.rules
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-disk.rules
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-disk.rules
Thu May 14 14:06:02 2009
@@ -18,7 +18,7 @@
GOTO="end-add"
LABEL="begin-add"
IMPORT{program}="/lib/udev/cdrom_id --export $tempnode"
- IMPORT{program}="/lib/udev/vol_id --export $tempnode"
+ IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
KERNEL=="?*" , SYMLINK+="disk/by-kernel/%k"
ENV{ID_FS_LABEL_ENC}=="?*",
SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
ENV{ID_FS_UUID_ENC}=="?*" ,
SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
Modified: trunk/gar-minimyth/script/utils/util-linux-ng/Makefile
==============================================================================
--- trunk/gar-minimyth/script/utils/util-linux-ng/Makefile (original)
+++ trunk/gar-minimyth/script/utils/util-linux-ng/Makefile Thu May 14
14:06:02 2009
@@ -1,15 +1,16 @@
GARNAME = util-linux-ng
-GARVERSION = 2.14.2
+GARVERSION = 2.15
CATEGORIES = utils
-MASTER_SITES = ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/
+MASTER_SITES = ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/
DISTFILES = $(DISTNAME).tar.bz2
+PATCHFILES = $(DISTNAME)-blkid.patch
LICENSE = GPL2
DESCRIPTION =
define BLURB
endef
-DEPENDS = lang/c lib/ncursesw lib/zlib utils/procps disk/e2fsprogs
system/udev
+DEPENDS = lang/c lib/libuuid lib/ncursesw lib/zlib
CONFIGURE_SCRIPTS = $(WORKSRC)/configure
BUILD_SCRIPTS = $(WORKSRC)/Makefile
@@ -19,10 +20,12 @@
--bindir=$(ebindir) \
--sbindir=$(esbindir) \
--libdir=$(elibdir) \
+ --enable-shared \
+ --disable-static \
--disable-rpath \
--enable-arch \
--disable-use-tty-group \
- --with-fsprobe=volume_id \
+ --with-fsprobe=builtin \
--with-gnu-ld
BUILD_ARGS = \
@@ -34,8 +37,7 @@
include ../../gar.mk
-PATH := $(PATH):$(build_DESTDIR)$(build_elibdir)/udev
-
pre-configure:
+ @cd $(WORKSRC) ; autoreconf --verbose --install --force
@$(call FIX_LIBTOOL,$(WORKSRC)/configure)
@$(MAKECOOKIE)
Modified: trunk/gar-minimyth/script/utils/util-linux-ng/checksums
==============================================================================
--- trunk/gar-minimyth/script/utils/util-linux-ng/checksums (original)
+++ trunk/gar-minimyth/script/utils/util-linux-ng/checksums Thu May 14
14:06:02 2009
@@ -1 +1,2 @@
-b9d0053a22cfcbf0b9c0aa6d6eccfbc8 download/util-linux-ng-2.14.2.tar.bz2
+71919b69eeecbba05612224d8f2c450f download/util-linux-ng-2.15.tar.bz2
+ab8a2d32910b071460190b426686b456 download/util-linux-ng-2.15-blkid.patch
Added:
trunk/gar-minimyth/script/utils/util-linux-ng/files/util-linux-ng-2.15-blkid.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/utils/util-linux-ng/files/util-linux-ng-2.15-blkid.patch
Thu May 14 14:06:02 2009
@@ -0,0 +1,11 @@
+diff -Naur util-linux-ng-2.15-old/libs/blkid/src/Makefile.am
util-linux-ng-2.15-new/libs/blkid/src/Makefile.am
+--- util-linux-ng-2.15-old/libs/blkid/src/Makefile.am 2009-05-05
12:16:46.000000000 -0700
++++ util-linux-ng-2.15-new/libs/blkid/src/Makefile.am 2009-05-14
11:12:06.000000000 -0700
+@@ -26,7 +26,6 @@
+ $(top_srcdir)/lib/md5.c
+
+ libblkid_la_LIBADD = probers/libblkid_probers.la $(common_ldadd)
+-libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym
+
+ # TODO: for unknown reason "make distcheck" requires
+ # full path to the version script
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
