Message ID | 3deec98a13ddca3dd940a6b20dae7e4dbe486009.1388738593.git.kibo@prevas.dk |
---|---|
State | Accepted |
Delegated to: | Esben Haabendal |
Headers | show |
Kim Bøndergaard <kibo@prevas.dk> writes: > --- > recipes/e2fsprogs/e2fsprogs.inc | 90 ++++++++++++++++++++++++++----- > recipes/e2fsprogs/e2fsprogs_1.42.8.oe | 12 +++++ > recipes/e2fsprogs/e2fsprogs_1.42.8.oe.sig | 1 + > 3 files changed, 90 insertions(+), 13 deletions(-) > create mode 100644 recipes/e2fsprogs/e2fsprogs_1.42.8.oe > create mode 100644 recipes/e2fsprogs/e2fsprogs_1.42.8.oe.sig > > diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc > index 1d41afa..74911b3 100644 > --- a/recipes/e2fsprogs/e2fsprogs.inc > +++ b/recipes/e2fsprogs/e2fsprogs.inc > @@ -7,11 +7,11 @@ RECIPE_TYPES = "machine native sdk" > inherit autotools pkgconfig > > DEPENDS = "native:gettext ${DEPENDS_LIBC}" > -DEPENDS_LIBC = "libpthread" > +DEPENDS_LIBC = "libpthread libc libgcc" > DEPENDS_LIBC:HOST_LIBC_mingw = "" > > require conf/fetch/sourceforge.conf > -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" > +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/files/e2fsprogs/v${PV}/e2fsprogs-${PV}.tar.gz" > > EXTRA_OECONF = "--enable-elf-shlibs --enable-dynamic-e2fsck \ > --disable-nls --disable-fsck" > @@ -20,6 +20,8 @@ EXTRA_OECONF = "--enable-elf-shlibs --enable-dynamic-e2fsck \ > DEPENDS += "libblkid libuuid" > EXTRA_OECONF += "--disable-libuuid --disable-libblkid" > > +DEPENDS += "libc libpthread" > + > do_compile[prefuncs] += "do_compile_pre" > do_compile_pre () { > ( cd util; ${BUILD_CC} subst.c -o subst ) > @@ -66,12 +68,21 @@ DEPENDS_${PN}-libcomerr-dev = "native:${PN}-libcomerr-dev-utils" > RDEPENDS_${PN}-libcomerr-dev = "host:${PN}-libcomerr-dev-utils" > RDEPENDS_${PN}-libcomerr += "libpthread" > > +DEPENDS_${PN}-libe2p = "libc" > +RDEPENDS_${PN}-libe2p = "libc" > + > FILES_${PN}-libe2p-dev = "${includedir}/e2p" > > +DEPENDS_${PN}-libext2fs = "libc libgcc libcom-err" > +RDEPENDS_${PN}-libext2fs = "libc libgcc libcom-err" > + By using the new libcom-err package name here, this new recipe is not backwards compatible, and as such, cannot be merged to OE-lite/base 3. Could you resend this in a form where it can be used without the libcomerr to libcom-err patch? All the libcomerr to libcom-err renaming part of this patch should be moved to the renaming patch, so I can just add that for OE-lite/base 4. > FILES_${PN}-libext2fs-dev = "${includedir}/ext2fs" > PACKAGES =+ "${PN}-libext2fs-dev-doc" > FILES_${PN}-libext2fs-dev-doc = "${infodir}/libext2fs*" > > +DEPENDS_${PN}-libss = "libc libcom-err" > +RDEPENDS_${PN}-libss = "libc libcom-err" > + > FILES_${PN}-libss-dev = "${includedir}/ss ${datadir}/ss" > PACKAGES =+ "${PN}-libss-dev-utils ${PN}-libss-dev-utils-doc" > FILES_${PN}-libss-dev-utils = "${bindir}/mk_cmds" > @@ -79,35 +90,88 @@ FILES_${PN}-libss-dev-utils-doc = "${mandir}/man?/mk_cmds.*" > DEPENDS_${PN}-libss-dev = "native:${PN}-libss-dev-utils" > RDEPENDS_${PN}-libss-dev = "host:${PN}-libss-dev-utils" > > +DEPENDS_${PN}-libcomerr = "libc libpthread" > +RDEPENDS_${PN}-libcomerr = "libc libpthread" > + > inherit auto-package-utils > > FILES_${PN}-e2fsck = "${sbindir}/fsck.ext*" > FILES_${PN}-e2fsck-doc = "${mandir}/man?/fsck.ext*.*" > PROVIDES_${PN}-e2fsck = "e2fsck fsck fsck-ext2 fsck-ext3 fsck-ext4 \ > ${mandir}/man?/fsck.ext*.*" > -RDEPENDS_${PN}-e2fsck = "${PN}-libext2fs ${PN}-libcomerr ${PN}-libe2p \ > - libblkid libuuid" > +DEPENDS_${PN}-e2fsck = "${PN}-libext2fs libcom-err ${PN}-libe2p \ > + libblkid libuuid libgcc libc" > +RDEPENDS_${PN}-e2fsck = "${PN}-libext2fs libcom-err ${PN}-libe2p \ > + libblkid libuuid libgcc libc" > > FILES_${PN}-mke2fs = "${sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" > FILES_${PN}-mke2fs-doc = "${mandir}/man?/mkfs.ext*.*" > PROVIDES_${PN}-mke2fs = "mke2fs mkfs-ext2 mkfs-ext3 mkfs-ext4 \ > ${mandir}/man?/mkfs.ext*.*" > -RDEPENDS_${PN}-mke2fs = "${PN}-libext2fs ${PN}-libcomerr ${PN}-libe2p \ > - libblkid libuuid" > +DEPENDS_${PN}-mke2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p \ > + libblkid libuuid libgcc libc" > +RDEPENDS_${PN}-mke2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p \ > + libblkid libuuid libgcc libc" > > FILES_${PN}-tune2fs = "${sbindir}/e2label ${sbindir}/findfs \ > ${mandir}/man?/e2label.* ${mandir}/man?/findfs.*" > -RDEPENDS_${PN}-tune2fs = "${PN}-libext2fs ${PN}-libcomerr ${PN}-libe2p \ > - libblkid libuuid" > +DEPENDS_${PN}-tune2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p \ > + libblkid libuuid libc" > +RDEPENDS_${PN}-tune2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p \ > + libblkid libuuid libc" > > -RDEPENDS_${PN}-resize2fs = "${PN}-libext2fs ${PN}-libcomerr ${PN}-libe2p" > +DEPENDS_${PN}-resize2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p libc libgcc" > +RDEPENDS_${PN}-resize2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p libc libgcc" > > -RDEPENDS_${PN}-e2freefrag = "${PN}-libext2fs ${PN}-libcomerr" > +DEPENDS_${PN}-e2freefrag = "${PN}-libext2fs libcom-err libc" > +RDEPENDS_${PN}-e2freefrag = "${PN}-libext2fs libcom-err libc" > > FILES_${PN}-e2initrdhelper = "${libdir}/e2initrd_helper" > -RDEPENDS_${PN}-e2initrdhelper = "${PN}-libext2fs ${PN}-libcomerr \ > +RDEPENDS_${PN}-e2initrdhelper = "${PN}-libext2fs libcom-err \ > libblkid libuuid" > > -RDEPENDS_${PN}-e2initrdhelper = "${PN}-libcomerr ${PN}-libe2p" > +RDEPENDS_${PN}-e2initrdhelper = "libcom-err ${PN}-libe2p" > + > +RDEPENDS_${PN}-e4defrag = "${PN}-libext2fs libcom-err" > + > +DEPENDS_${PN}-logsave = "libc" > +RDEPENDS_${PN}-logsave = "libc" > + > +DEPENDS_${PN}-dumpe2fs = "${PN}-libe2p ${PN}-libext2fs libcom-err \ > + libuuid libc" > +RDEPENDS_${PN}-dumpe2fs = "${PN}-libe2p ${PN}-libext2fs libcom-err \ > + libuuid libc" > + > +DEPENDS_${PN}-debugfs = "${PN}-libe2p ${PN}-libext2fs libcom-err ${PN}-libss \ > + libblkid libuuid libgcc libc" > +RDEPENDS_${PN}-debugfs = "${PN}-libe2p ${PN}-libext2fs libcom-err ${PN}-libss \ > + libblkid libuuid libgcc libc" > + > +DEPENDS_${PN}-badblocks = "${PN}-libe2p ${PN}-libext2fs libcom-err ${PN}-libss \ > + libblkid libuuid libgcc libc" > +RDEPENDS_${PN}-badblocks = "${PN}-libe2p ${PN}-libext2fs libcom-err ${PN}-libss \ > + libblkid libuuid libgcc libc" > + > +DEPENDS_${PN}-mklostfound = "libc" > +RDEPENDS_${PN}-mklostfound = "libc" > + > +DEPENDS_${PN}-filefrag = "libc libgcc" > +RDEPENDS_${PN}-filefrag = "libc libgcc" > + > +DEPENDS_${PN}-uuidd = "libc libuuid" > +RDEPENDS_${PN}-uuidd = "libc libuuid" > + > +DEPENDS_${PN}-e2image = "${PN}-libext2fs ${PN}-libcom-err libgcc libc" > +RDEPENDS_${PN}-e2image = "${PN}-libext2fs ${PN}-libcom-err libgcc libc" > + > +DEPENDS_${PN}-e4defrag = "${PN}-libext2fs ${PN}-libcom-err libgcc libc" > +RDEPENDS_${PN}-e4defrag = "${PN}-libext2fs ${PN}-libcom-err libgcc libc" > + > +DEPENDS_${PN}-e2undo = "${PN}-libext2fs ${PN}-libcom-err libc" > +RDEPENDS_${PN}-e2undo = "${PN}-libext2fs ${PN}-libcom-err libc" > + > +DEPENDS_${PN}-chattr = "${PN}-libe2p libcom-err libc" > +RDEPENDS_${PN}-chattr = "${PN}-libe2p libcom-err libc" > > -RDEPENDS_${PN}-e4defrag = "${PN}-libext2fs ${PN}-libcomerr" > +DEPENDS_${PN}-lsattr = "${PN}-libe2p libcom-err libc" > +RDEPENDS_${PN}-lsattr = "${PN}-libe2p libcom-err libc" > diff --git a/recipes/e2fsprogs/e2fsprogs_1.42.8.oe b/recipes/e2fsprogs/e2fsprogs_1.42.8.oe > new file mode 100644 > index 0000000..f9bad8d > --- /dev/null > +++ b/recipes/e2fsprogs/e2fsprogs_1.42.8.oe > @@ -0,0 +1,12 @@ > +LICENSE = "GPL-2.0 & LGPL-2.0 & MIT & BSD-3-Clause*" > + > +require e2fsprogs.inc > + > +# Map the old non-API functions uuid__generate* to the new __uuid_generate > +# API functions. > +CFLAGS += "-Duuid__generate_random=__uuid_generate_random" > +CFLAGS += "-Duuid__generate_time=__uuid_generate_time" > + > +AUTO_PACKAGE_UTILS = "e2fsck mke2fs tune2fs badblocks resize2fs e2freefrag \ > + mklostfound:mklost+found uuidd e2initrdhelper logsave \ > + debugfs dumpe2fs e2image e2undo filefrag chattr lsattr e4defrag" > diff --git a/recipes/e2fsprogs/e2fsprogs_1.42.8.oe.sig b/recipes/e2fsprogs/e2fsprogs_1.42.8.oe.sig > new file mode 100644 > index 0000000..c9ffa1c > --- /dev/null > +++ b/recipes/e2fsprogs/e2fsprogs_1.42.8.oe.sig > @@ -0,0 +1 @@ > +79cdb2374a9c0e68f01739598679db06d546b897 e2fsprogs-1.42.8.tar.gz
Hi again I will merge it to master, and make the required changes. /Esben
diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc index 1d41afa..74911b3 100644 --- a/recipes/e2fsprogs/e2fsprogs.inc +++ b/recipes/e2fsprogs/e2fsprogs.inc @@ -7,11 +7,11 @@ RECIPE_TYPES = "machine native sdk" inherit autotools pkgconfig DEPENDS = "native:gettext ${DEPENDS_LIBC}" -DEPENDS_LIBC = "libpthread" +DEPENDS_LIBC = "libpthread libc libgcc" DEPENDS_LIBC:HOST_LIBC_mingw = "" require conf/fetch/sourceforge.conf -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/files/e2fsprogs/v${PV}/e2fsprogs-${PV}.tar.gz" EXTRA_OECONF = "--enable-elf-shlibs --enable-dynamic-e2fsck \ --disable-nls --disable-fsck" @@ -20,6 +20,8 @@ EXTRA_OECONF = "--enable-elf-shlibs --enable-dynamic-e2fsck \ DEPENDS += "libblkid libuuid" EXTRA_OECONF += "--disable-libuuid --disable-libblkid" +DEPENDS += "libc libpthread" + do_compile[prefuncs] += "do_compile_pre" do_compile_pre () { ( cd util; ${BUILD_CC} subst.c -o subst ) @@ -66,12 +68,21 @@ DEPENDS_${PN}-libcomerr-dev = "native:${PN}-libcomerr-dev-utils" RDEPENDS_${PN}-libcomerr-dev = "host:${PN}-libcomerr-dev-utils" RDEPENDS_${PN}-libcomerr += "libpthread" +DEPENDS_${PN}-libe2p = "libc" +RDEPENDS_${PN}-libe2p = "libc" + FILES_${PN}-libe2p-dev = "${includedir}/e2p" +DEPENDS_${PN}-libext2fs = "libc libgcc libcom-err" +RDEPENDS_${PN}-libext2fs = "libc libgcc libcom-err" + FILES_${PN}-libext2fs-dev = "${includedir}/ext2fs" PACKAGES =+ "${PN}-libext2fs-dev-doc" FILES_${PN}-libext2fs-dev-doc = "${infodir}/libext2fs*" +DEPENDS_${PN}-libss = "libc libcom-err" +RDEPENDS_${PN}-libss = "libc libcom-err" + FILES_${PN}-libss-dev = "${includedir}/ss ${datadir}/ss" PACKAGES =+ "${PN}-libss-dev-utils ${PN}-libss-dev-utils-doc" FILES_${PN}-libss-dev-utils = "${bindir}/mk_cmds" @@ -79,35 +90,88 @@ FILES_${PN}-libss-dev-utils-doc = "${mandir}/man?/mk_cmds.*" DEPENDS_${PN}-libss-dev = "native:${PN}-libss-dev-utils" RDEPENDS_${PN}-libss-dev = "host:${PN}-libss-dev-utils" +DEPENDS_${PN}-libcomerr = "libc libpthread" +RDEPENDS_${PN}-libcomerr = "libc libpthread" + inherit auto-package-utils FILES_${PN}-e2fsck = "${sbindir}/fsck.ext*" FILES_${PN}-e2fsck-doc = "${mandir}/man?/fsck.ext*.*" PROVIDES_${PN}-e2fsck = "e2fsck fsck fsck-ext2 fsck-ext3 fsck-ext4 \ ${mandir}/man?/fsck.ext*.*" -RDEPENDS_${PN}-e2fsck = "${PN}-libext2fs ${PN}-libcomerr ${PN}-libe2p \ - libblkid libuuid" +DEPENDS_${PN}-e2fsck = "${PN}-libext2fs libcom-err ${PN}-libe2p \ + libblkid libuuid libgcc libc" +RDEPENDS_${PN}-e2fsck = "${PN}-libext2fs libcom-err ${PN}-libe2p \ + libblkid libuuid libgcc libc" FILES_${PN}-mke2fs = "${sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" FILES_${PN}-mke2fs-doc = "${mandir}/man?/mkfs.ext*.*" PROVIDES_${PN}-mke2fs = "mke2fs mkfs-ext2 mkfs-ext3 mkfs-ext4 \ ${mandir}/man?/mkfs.ext*.*" -RDEPENDS_${PN}-mke2fs = "${PN}-libext2fs ${PN}-libcomerr ${PN}-libe2p \ - libblkid libuuid" +DEPENDS_${PN}-mke2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p \ + libblkid libuuid libgcc libc" +RDEPENDS_${PN}-mke2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p \ + libblkid libuuid libgcc libc" FILES_${PN}-tune2fs = "${sbindir}/e2label ${sbindir}/findfs \ ${mandir}/man?/e2label.* ${mandir}/man?/findfs.*" -RDEPENDS_${PN}-tune2fs = "${PN}-libext2fs ${PN}-libcomerr ${PN}-libe2p \ - libblkid libuuid" +DEPENDS_${PN}-tune2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p \ + libblkid libuuid libc" +RDEPENDS_${PN}-tune2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p \ + libblkid libuuid libc" -RDEPENDS_${PN}-resize2fs = "${PN}-libext2fs ${PN}-libcomerr ${PN}-libe2p" +DEPENDS_${PN}-resize2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p libc libgcc" +RDEPENDS_${PN}-resize2fs = "${PN}-libext2fs libcom-err ${PN}-libe2p libc libgcc" -RDEPENDS_${PN}-e2freefrag = "${PN}-libext2fs ${PN}-libcomerr" +DEPENDS_${PN}-e2freefrag = "${PN}-libext2fs libcom-err libc" +RDEPENDS_${PN}-e2freefrag = "${PN}-libext2fs libcom-err libc" FILES_${PN}-e2initrdhelper = "${libdir}/e2initrd_helper" -RDEPENDS_${PN}-e2initrdhelper = "${PN}-libext2fs ${PN}-libcomerr \ +RDEPENDS_${PN}-e2initrdhelper = "${PN}-libext2fs libcom-err \ libblkid libuuid" -RDEPENDS_${PN}-e2initrdhelper = "${PN}-libcomerr ${PN}-libe2p" +RDEPENDS_${PN}-e2initrdhelper = "libcom-err ${PN}-libe2p" + +RDEPENDS_${PN}-e4defrag = "${PN}-libext2fs libcom-err" + +DEPENDS_${PN}-logsave = "libc" +RDEPENDS_${PN}-logsave = "libc" + +DEPENDS_${PN}-dumpe2fs = "${PN}-libe2p ${PN}-libext2fs libcom-err \ + libuuid libc" +RDEPENDS_${PN}-dumpe2fs = "${PN}-libe2p ${PN}-libext2fs libcom-err \ + libuuid libc" + +DEPENDS_${PN}-debugfs = "${PN}-libe2p ${PN}-libext2fs libcom-err ${PN}-libss \ + libblkid libuuid libgcc libc" +RDEPENDS_${PN}-debugfs = "${PN}-libe2p ${PN}-libext2fs libcom-err ${PN}-libss \ + libblkid libuuid libgcc libc" + +DEPENDS_${PN}-badblocks = "${PN}-libe2p ${PN}-libext2fs libcom-err ${PN}-libss \ + libblkid libuuid libgcc libc" +RDEPENDS_${PN}-badblocks = "${PN}-libe2p ${PN}-libext2fs libcom-err ${PN}-libss \ + libblkid libuuid libgcc libc" + +DEPENDS_${PN}-mklostfound = "libc" +RDEPENDS_${PN}-mklostfound = "libc" + +DEPENDS_${PN}-filefrag = "libc libgcc" +RDEPENDS_${PN}-filefrag = "libc libgcc" + +DEPENDS_${PN}-uuidd = "libc libuuid" +RDEPENDS_${PN}-uuidd = "libc libuuid" + +DEPENDS_${PN}-e2image = "${PN}-libext2fs ${PN}-libcom-err libgcc libc" +RDEPENDS_${PN}-e2image = "${PN}-libext2fs ${PN}-libcom-err libgcc libc" + +DEPENDS_${PN}-e4defrag = "${PN}-libext2fs ${PN}-libcom-err libgcc libc" +RDEPENDS_${PN}-e4defrag = "${PN}-libext2fs ${PN}-libcom-err libgcc libc" + +DEPENDS_${PN}-e2undo = "${PN}-libext2fs ${PN}-libcom-err libc" +RDEPENDS_${PN}-e2undo = "${PN}-libext2fs ${PN}-libcom-err libc" + +DEPENDS_${PN}-chattr = "${PN}-libe2p libcom-err libc" +RDEPENDS_${PN}-chattr = "${PN}-libe2p libcom-err libc" -RDEPENDS_${PN}-e4defrag = "${PN}-libext2fs ${PN}-libcomerr" +DEPENDS_${PN}-lsattr = "${PN}-libe2p libcom-err libc" +RDEPENDS_${PN}-lsattr = "${PN}-libe2p libcom-err libc" diff --git a/recipes/e2fsprogs/e2fsprogs_1.42.8.oe b/recipes/e2fsprogs/e2fsprogs_1.42.8.oe new file mode 100644 index 0000000..f9bad8d --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs_1.42.8.oe @@ -0,0 +1,12 @@ +LICENSE = "GPL-2.0 & LGPL-2.0 & MIT & BSD-3-Clause*" + +require e2fsprogs.inc + +# Map the old non-API functions uuid__generate* to the new __uuid_generate +# API functions. +CFLAGS += "-Duuid__generate_random=__uuid_generate_random" +CFLAGS += "-Duuid__generate_time=__uuid_generate_time" + +AUTO_PACKAGE_UTILS = "e2fsck mke2fs tune2fs badblocks resize2fs e2freefrag \ + mklostfound:mklost+found uuidd e2initrdhelper logsave \ + debugfs dumpe2fs e2image e2undo filefrag chattr lsattr e4defrag" diff --git a/recipes/e2fsprogs/e2fsprogs_1.42.8.oe.sig b/recipes/e2fsprogs/e2fsprogs_1.42.8.oe.sig new file mode 100644 index 0000000..c9ffa1c --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs_1.42.8.oe.sig @@ -0,0 +1 @@ +79cdb2374a9c0e68f01739598679db06d546b897 e2fsprogs-1.42.8.tar.gz