diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-12-03 23:42:40 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-12-14 19:39:07 +0000 |
commit | 7f28bc5ce604549f6a1ef536e8d7eafe0d779a79 (patch) | |
tree | c68de3b8625b35a33d2d05f186633019154ae52b /import-layers/meta-openembedded/meta-filesystems | |
parent | d5c08fd2c1008804ee8631d9dc013649b24576e5 (diff) | |
download | talos-openbmc-7f28bc5ce604549f6a1ef536e8d7eafe0d779a79.tar.gz talos-openbmc-7f28bc5ce604549f6a1ef536e8d7eafe0d779a79.zip |
Squashed 'import-layers/meta-openembedded/' changes from df3537259..b40116cf4
Yocto 2.2.2 (Morty)
Change-Id: I3998555f14538d8306be995bcfb366173e04e975
git-subtree-dir: import-layers/meta-openembedded
git-subtree-split: b40116cf457b88a2db14b86fda9627fb34d56ae6
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/meta-openembedded/meta-filesystems')
3 files changed, 52 insertions, 3 deletions
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch new file mode 100644 index 000000000..30ad1b8ad --- /dev/null +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch @@ -0,0 +1,46 @@ +From a322794f80f2718ae4463669c4b6ab2fbb15ffec Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 5 Apr 2017 17:36:45 +0000 +Subject: [PATCH] Add $(LDFLAGS) to linker cmdline + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -14,7 +14,7 @@ ZLIB_O := crc32.o deflate.o adler32.o co + CC := gcc + CHECK := cgcc + CHECKFLAGS := -D__CHECK_ENDIAN__ +-CFLAGS := -std=gnu99 ++CFLAGS += -std=gnu99 + CFLAGS += -Wall + CFLAGS += -Os + CFLAGS += -D_FILE_OFFSET_BITS=64 +@@ -28,18 +28,18 @@ $(ZLIB_O): /usr/lib/libz.a + + ifdef S + EXTRA_OBJ := $(ZLIB_O) +-CFLAGS += -static ++LDFLAGS += -static + else +-CFLAGS += -lz ++LDFLAGS += -lz + endif + + mklogfs: $(EXTRA_OBJ) + mklogfs: mkfs.o lib.o btree.o segment.o readwrite.o +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + + logfsck: $(ZLIB_O) + logfsck: fsck.o lib.o journal.o super.o +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + + $(OBJ): kerncompat.h logfs.h logfs_abi.h btree.h + diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb index 32ebec83d..c41f0eaa6 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb @@ -11,7 +11,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://fsck.c;md5=3859dc73da97909ff1d0125e88a27e02" DEPENDS = "zlib" -SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git" +SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git \ + file://0001-Add-LDFLAGS-to-linker-cmdline.patch \ +" SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4" S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.2.3.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.2.3.bb index 3019db7ab..440f33618 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.2.3.bb +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.2.3.bb @@ -11,8 +11,9 @@ HOMEPAGE = "http://code.google.com/p/exfat/" SECTION = "universe/otherosfs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "${DEBIAN_MIRROR}/main/e/exfat-utils/exfat-utils_${PV}.orig.tar.gz \ -" + +SRC_URI = "https://github.com/relan/exfat/releases/download/v${PV}/${BP}.tar.gz" + DEPENDS = "virtual/libc" inherit pkgconfig autotools |