diff options
-rw-r--r-- | conf/checksums.ini | 8 | ||||
-rw-r--r-- | recipes/device-mapper/device-mapper-1.02.28/devmap-mknod-busybox.patch | 9 | ||||
-rw-r--r-- | recipes/device-mapper/device-mapper-1.02.28/remove_insanity.patch | 42 | ||||
-rw-r--r-- | recipes/device-mapper/device-mapper_1.01.05.bb | 4 | ||||
-rw-r--r-- | recipes/device-mapper/device-mapper_1.02.28.bb | 37 | ||||
-rw-r--r-- | recipes/udev/udev_141.bb | 3 |
6 files changed, 101 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 0b8c8697e5..2764372fc1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -186,6 +186,10 @@ sha256=d392567cb39b4ea606c0e0acafd8ed72320311b995336ece5fcefcf9b150e9d7 md5=8b311547f4a2c8c6b6598e3318d66cd7 sha256=d2d21f995d1a152ca2d8beea6d37f31e48cca034b82ceb7322f39422e849e9cf +[http://hal.freedesktop.org/releases/DeviceKit-disks-004.tar.gz] +md5=1ed8e1931f56ad3fc53ba485391434b5 +sha256=e9cc2ed4db0f48a9fdb353f6774df585ac1bc3a0f7c77fcede1c1c27497882bd + [http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz] md5=2449bfe21d6589c96eebf94dae24df6b sha256=3cebe0a6894daee3bfa5d9619fc90e7619cb6a77ac1b04d027341cd6033ae989 @@ -4566,6 +4570,10 @@ sha256=49c8303f58abf3a0efbbd42decdc5968688df32c154cffb20a1c3c1ae8b92048 md5=074cf116cc2c7194f2d100bc5f743833 sha256=963cc8a1f7e73a0929b7b527f6b4cfc5f78c932d673b5c13c889108d3182811a +[ftp://sources.redhat.com/pub/dm/device-mapper.1.02.28.tgz] +md5=c9ae0776994a419f9e1ba842164bb626 +sha256=24c7887fe896325a6cdc86b8beeb0d9c2de8b1c4cb20f53c2dc8f90963fc39bf + [https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h] md5=c0124afc760d4fe8c24ffcf15ba7f391 sha256=4e0c1726f9c565deec6d6af9eebda47ca6dea473f3280cc89beb321ae33ff962 diff --git a/recipes/device-mapper/device-mapper-1.02.28/devmap-mknod-busybox.patch b/recipes/device-mapper/device-mapper-1.02.28/devmap-mknod-busybox.patch new file mode 100644 index 0000000000..8b24f143dd --- /dev/null +++ b/recipes/device-mapper/device-mapper-1.02.28/devmap-mknod-busybox.patch @@ -0,0 +1,9 @@ +--- device-mapper.1.01.05/scripts/devmap_mknod.sh 2002-07-23 05:50:13.000000000 -0700 ++++ device-mapper.1.01.05/scripts/devmap_mknod.sh~ 2005-08-25 14:51:13.000000000 -0700 +@@ -37,5 +37,5 @@ + test -e $CONTROL && rm -f $CONTROL + + echo "Creating $CONTROL character device with major:$MAJOR minor:$MINOR." +-mknod --mode=600 $CONTROL c $MAJOR $MINOR ++mknod -m 600 $CONTROL c $MAJOR $MINOR + diff --git a/recipes/device-mapper/device-mapper-1.02.28/remove_insanity.patch b/recipes/device-mapper/device-mapper-1.02.28/remove_insanity.patch new file mode 100644 index 0000000000..f78c341c14 --- /dev/null +++ b/recipes/device-mapper/device-mapper-1.02.28/remove_insanity.patch @@ -0,0 +1,42 @@ +--- /tmp/Makefile.in 2009-05-21 13:45:20.000000000 +0200 ++++ device-mapper.1.02.28/dmsetup/Makefile.in 2009-05-21 14:09:43.000000000 +0200 +@@ -31,12 +31,10 @@ + include ../make.tmpl + + dmsetup: $(OBJECTS) $(interfacedir)/libdevmapper.$(LIB_SUFFIX) +- $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) \ +- -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) ++ $(CC) -o $@ $(OBJECTS) -L$(interfacedir) -ldevmapper $(LIBS) $(CFLAGS) $(LDFLAGS) + + dmsetup.static: $(OBJECTS) $(interfacedir)/libdevmapper.a +- $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) -static \ +- -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) \ ++ $(CC) -o $@ $(OBJECTS) -L$(interfacedir) -ldevmapper $(LIBS) $(CFLAGS) $(LDFLAGS) -static \ + $(LIB_PTHREAD) + + install: $(INSTALL_TYPE) +--- /tmp/make.tmpl.in 2009-05-21 14:24:02.000000000 +0200 ++++ device-mapper.1.02.28/make.tmpl.in 2009-05-21 14:29:20.000000000 +0200 +@@ -151,19 +151,19 @@ + $(TARGETS): $(OBJECTS) + + %.o: %.c +- $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $< -o $@ ++ $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) ${LDFLAGS} $< -o $@ + + %.pot: %.c Makefile + $(CC) -E $(INCLUDES) -include $(top_srcdir)/include/pogen.h \ + $(DEFS) $(CFLAGS) $< > $@ + + %.so: %.o +- $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $< -o $@ ++ $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) ${LDFLAGS} $< -o $@ + + ifeq ("@LIB_SUFFIX@","so") + $(LIB_SHARED): $(OBJECTS) $(LDDEPS) + $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \ +- $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ ++ $(CFLAGS) $(CLDFLAGS) ${LDFLAGS} $(OBJECTS) $(LIBS) -o $@ + endif + + ifeq ("@LIB_SUFFIX@","dylib") diff --git a/recipes/device-mapper/device-mapper_1.01.05.bb b/recipes/device-mapper/device-mapper_1.01.05.bb index bc02e6a71f..2af9990839 100644 --- a/recipes/device-mapper/device-mapper_1.01.05.bb +++ b/recipes/device-mapper/device-mapper_1.01.05.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The Device-mapper is a new component of the linux kernel \ that supports logical volume management. It is required by LVM2 and EVMS. \ The original LVM (included in stock 2.4 kernels) does not use it." LICENSE = "GPL" -PR = "r3" +PR = "r4" S = "${WORKDIR}/${PN}.${PV}" @@ -15,6 +15,8 @@ inherit autotools update-rc.d # The install-script will fail without this. EXTRA_OECONF="--with-user= --with-group= " +TARGET_CC_ARCH += "${LDFLAGS}" + INITSCRIPT_NAME = "devmap_mknod.sh" INITSCRIPT_PARAMS = "defaults" diff --git a/recipes/device-mapper/device-mapper_1.02.28.bb b/recipes/device-mapper/device-mapper_1.02.28.bb new file mode 100644 index 0000000000..bd97d15848 --- /dev/null +++ b/recipes/device-mapper/device-mapper_1.02.28.bb @@ -0,0 +1,37 @@ +SECTION = "libs" +DESCRIPTION = "The Device-mapper is a new component of the linux kernel \ +that supports logical volume management. It is required by LVM2 and EVMS. \ +The original LVM (included in stock 2.4 kernels) does not use it." +LICENSE = "GPL" + +S = "${WORKDIR}/${PN}.${PV}" + +SRC_URI = "ftp://sources.redhat.com/pub/dm/device-mapper.${PV}.tgz \ + file://devmap-mknod-busybox.patch;patch=1 \ + file://remove_insanity.patch;patch=1 " + +inherit autotools_stage update-rc.d +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +# The install-script will fail without this. +EXTRA_OECONF="--with-user= --with-group= " + +INITSCRIPT_NAME = "devmap_mknod.sh" +INITSCRIPT_PARAMS = "defaults" + +do_install_append() { + install -d ${D}/${libdir}/ioctl + install -m 755 ${S}/lib/ioctl/libdevmapper.a ${D}/${libdir}/ioctl/ + install -D -m 755 ${S}/scripts/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} +} + +FILES_${PN}-dev += "${libdir}/ioctl/*.a" + +do_stage_append() { + install -d ${STAGING_LIBDIR}/pkgconfig/ + for pc in ${S}/*/*.pc ; do + cp $pc ${STAGING_LIBDIR}/pkgconfig/ + cp $pc ${STAGING_LIBDIR}/pkgconfig/$(echo $(basename $pc) | sed s:lib::g) + done +} + diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb index 1482601bf9..2c35199534 100644 --- a/recipes/udev/udev_141.bb +++ b/recipes/udev/udev_141.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" # Untested DEFAULT_PREFERENCE = "-1" -PR = "r4" +PR = "r5" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://mount.blacklist \ @@ -91,6 +91,7 @@ do_install_append_h2200() { do_stage_append() { install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR} oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR} + oe_libinstall -C udev/lib -so libudev ${STAGING_LIBDIR} } |