[oe,meta-filesystems,19/49] xfsprogs: Upgrade 3.2.3 -> 4.8.0

Message ID 20161123092209.23699-19-raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj Nov. 23, 2016, 9:21 a.m.
Change-Id: I0015da261d540f99bfdebba703fef9403eebff7b
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 .../recipes-utils/xfsprogs/xfsprogs_3.2.3.bb       | 55 ----------------------
 .../recipes-utils/xfsprogs/xfsprogs_4.8.0.bb       | 52 ++++++++++++++++++++
 2 files changed, 52 insertions(+), 55 deletions(-)
 delete mode 100644 meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb
 create mode 100644 meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.8.0.bb

-- 
2.10.2

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Martin Jansa Nov. 25, 2016, 12:31 a.m. | #1
Failed to build in bitbake world:

| ../include/xfs/linux.h:20:23: fatal error: uuid/uuid.h: No such file
or directory
|  #include <uuid/uuid.h>
|                        ^
| compilation terminated.
| make[2]: *** [crc32selftest] Error 1


On Wed, Nov 23, 2016 at 10:21 AM, Khem Raj <raj.khem@gmail.com> wrote:

> Change-Id: I0015da261d540f99bfdebba703fef9403eebff7b

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>  .../recipes-utils/xfsprogs/xfsprogs_3.2.3.bb       | 55

> ----------------------

>  .../recipes-utils/xfsprogs/xfsprogs_4.8.0.bb       | 52

> ++++++++++++++++++++

>  2 files changed, 52 insertions(+), 55 deletions(-)

>  delete mode 100644 meta-filesystems/recipes-utils/xfsprogs/

> xfsprogs_3.2.3.bb

>  create mode 100644 meta-filesystems/recipes-utils/xfsprogs/

> xfsprogs_4.8.0.bb

>

> diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb

> b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb

> deleted file mode 100644

> index 460a898..0000000

> --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb

> +++ /dev/null

> @@ -1,55 +0,0 @@

> -SUMMARY = "XFS Filesystem Utilities"

> -HOMEPAGE = "http://oss.sgi.com/projects/xfs"

> -SECTION = "base"

> -LICENSE = "GPLv2 & LGPLv2.1"

> -LICENSE_libhandle = "LGPLv2.1"

> -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=dbdb5f4329b7e7145de650e9ecd4ac

> 2a"

> -DEPENDS = "util-linux"

> -

> -SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${BP}.tar.gz \

> -    file://xfsprogs-generate-crctable-which-is-moved-into-runti.patch \

> -    file://remove-install-as-user.patch \

> -    file://drop-configure-check-for-aio.patch \

> -"

> -

> -SRC_URI[md5sum] = "9f383e36682709e62b12c125e5d8b895"

> -SRC_URI[sha256sum] = "7a5124a880997939551b519610a2e5

> 4bd4cd0b0adfd563ce3f4de30827109ac9"

> -

> -inherit autotools-brokensep

> -

> -PACKAGES =+ "${PN}-fsck ${PN}-mkfs libhandle"

> -

> -RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs"

> -

> -FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs"

> -FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs"

> -FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}"

> -

> -EXTRA_OECONF = "--enable-gettext=no"

> -do_configure () {

> -    # Prevent Makefile from calling configure without arguments,

> -    # when do_configure gets called for a second time.

> -    rm -f include/builddefs include/platform_defs.h

> -    # Recreate configure script.

> -    rm -f configure

> -    oe_runmake configure

> -    # Configure.

> -    export DEBUG="-DNDEBUG"

> -    gnu-configize --force

> -    oe_runconf

> -}

> -

> -LIBTOOL = "${HOST_SYS}-libtool"

> -EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"

> -TARGET_CC_ARCH += "${LDFLAGS}"

> -PARALLEL_MAKE = ""

> -

> -do_install () {

> -    export DIST_ROOT=${D}

> -    oe_runmake install

> -    # needed for xfsdump

> -    oe_runmake install-dev

> -}

> -

> -# http://errors.yoctoproject.org/Errors/Details/83236/

> -PNBLACKLIST[xfsprogs] ?= "BROKEN: Needs upgrade to 4.5.0 version to be

> compatible with Kernel uapi changes from 4.5"

> diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.8.0.bb

> b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.8.0.bb

> new file mode 100644

> index 0000000..049a4be

> --- /dev/null

> +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.8.0.bb

> @@ -0,0 +1,52 @@

> +SUMMARY = "XFS Filesystem Utilities"

> +HOMEPAGE = "http://oss.sgi.com/projects/xfs"

> +SECTION = "base"

> +LICENSE = "GPLv2 & LGPLv2.1"

> +LICENSE_libhandle = "LGPLv2.1"

> +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=dbdb5f4329b7e7145de650e9ecd4ac

> 2a"

> +DEPENDS = "util-linux"

> +SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${

> BP}.tar.xz \

> +"

> +SRC_URI[md5sum] = "4f047bc9a28b48a95c6db0ad5ce4dbcb"

> +SRC_URI[sha256sum] = "82ce9cb3a55f4e208e8fe3471ff0af

> f0602b8300f3e50bdf05cc7e11549686f9"

> +

> +inherit autotools-brokensep

> +

> +PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle"

> +

> +

> +RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair"

> +

> +FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs"

> +FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs"

> +FILES_${PN}-repair = "${base_sbindir}/xfs_repair"

> +

> +FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}"

> +

> +EXTRA_OECONF = "--enable-gettext=no \

> +               INSTALL_USER=root \

> +               INSTALL_GROUP=root \

> +"

> +

> +EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader"

> +

> +PACKAGECONFIG ??= "readline blkid"

> +

> +PACKAGECONFIG[readline] = "--enable-readline=yes,--

> enable-readline=no,readline"

> +PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux"

> +

> +export DEBUG="-DNDEBUG"

> +

> +EXTRA_OEMAKE = "DIST_ROOT='${D}'"

> +

> +do_configure_prepend () {

> +    # Prevent Makefile from calling configure without arguments,

> +    # when do_configure gets called for a second time.

> +    rm -f ${B}/include/builddefs ${B}/include/platform_defs.h

> ${B}/configure

> +    # Recreate configure script.

> +    oe_runmake configure

> +}

> +

> +do_install_append() {

> +        oe_runmake 'DESTDIR=${D}' install-dev

> +}

> --

> 2.10.2

>

> --

> _______________________________________________

> Openembedded-devel mailing list

> Openembedded-devel@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

>

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Khem Raj Nov. 25, 2016, 10:41 a.m. | #2
On Thu, Nov 24, 2016 at 4:31 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Failed to build in bitbake world:

>

> | ../include/xfs/linux.h:20:23: fatal error: uuid/uuid.h: No such file

> or directory

> |  #include <uuid/uuid.h>

> |                        ^

> | compilation terminated.

> | make[2]: *** [crc32selftest] Error 1

>


There were more problems following this one. Fixed them too and sent a V2
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch hide | download patch | download mbox

diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb
deleted file mode 100644
index 460a898..0000000
--- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb
+++ /dev/null
@@ -1,55 +0,0 @@ 
-SUMMARY = "XFS Filesystem Utilities"
-HOMEPAGE = "http://oss.sgi.com/projects/xfs"
-SECTION = "base"
-LICENSE = "GPLv2 & LGPLv2.1"
-LICENSE_libhandle = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://doc/COPYING;md5=dbdb5f4329b7e7145de650e9ecd4ac2a"
-DEPENDS = "util-linux"
-
-SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${BP}.tar.gz \
-    file://xfsprogs-generate-crctable-which-is-moved-into-runti.patch \
-    file://remove-install-as-user.patch \
-    file://drop-configure-check-for-aio.patch \
-"
-
-SRC_URI[md5sum] = "9f383e36682709e62b12c125e5d8b895"
-SRC_URI[sha256sum] = "7a5124a880997939551b519610a2e54bd4cd0b0adfd563ce3f4de30827109ac9"
-
-inherit autotools-brokensep
-
-PACKAGES =+ "${PN}-fsck ${PN}-mkfs libhandle"
-
-RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs"
-
-FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs"
-FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs"
-FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}"
-
-EXTRA_OECONF = "--enable-gettext=no"
-do_configure () {
-    # Prevent Makefile from calling configure without arguments,
-    # when do_configure gets called for a second time.
-    rm -f include/builddefs include/platform_defs.h
-    # Recreate configure script.
-    rm -f configure
-    oe_runmake configure
-    # Configure.
-    export DEBUG="-DNDEBUG"
-    gnu-configize --force
-    oe_runconf
-}
-
-LIBTOOL = "${HOST_SYS}-libtool"
-EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
-TARGET_CC_ARCH += "${LDFLAGS}"
-PARALLEL_MAKE = ""
-
-do_install () {
-    export DIST_ROOT=${D}
-    oe_runmake install
-    # needed for xfsdump
-    oe_runmake install-dev
-}
-
-# http://errors.yoctoproject.org/Errors/Details/83236/
-PNBLACKLIST[xfsprogs] ?= "BROKEN: Needs upgrade to 4.5.0 version to be compatible with Kernel uapi changes from 4.5"
diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.8.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.8.0.bb
new file mode 100644
index 0000000..049a4be
--- /dev/null
+++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.8.0.bb
@@ -0,0 +1,52 @@ 
+SUMMARY = "XFS Filesystem Utilities"
+HOMEPAGE = "http://oss.sgi.com/projects/xfs"
+SECTION = "base"
+LICENSE = "GPLv2 & LGPLv2.1"
+LICENSE_libhandle = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://doc/COPYING;md5=dbdb5f4329b7e7145de650e9ecd4ac2a"
+DEPENDS = "util-linux"
+SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \
+"
+SRC_URI[md5sum] = "4f047bc9a28b48a95c6db0ad5ce4dbcb"
+SRC_URI[sha256sum] = "82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9"
+
+inherit autotools-brokensep
+
+PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle"
+
+
+RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair"
+
+FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs"
+FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs"
+FILES_${PN}-repair = "${base_sbindir}/xfs_repair"
+
+FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}"
+
+EXTRA_OECONF = "--enable-gettext=no \
+               INSTALL_USER=root \
+               INSTALL_GROUP=root \
+"
+
+EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader"
+
+PACKAGECONFIG ??= "readline blkid"
+
+PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline"
+PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux"
+
+export DEBUG="-DNDEBUG"
+
+EXTRA_OEMAKE = "DIST_ROOT='${D}'"
+
+do_configure_prepend () {
+    # Prevent Makefile from calling configure without arguments,
+    # when do_configure gets called for a second time.
+    rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure
+    # Recreate configure script.
+    oe_runmake configure
+}
+
+do_install_append() {
+        oe_runmake 'DESTDIR=${D}' install-dev
+}