diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
| commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
| tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-devtools/file | |
| parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
| download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz | |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/file')
| -rw-r--r-- | poky/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch | 39 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/file/file_5.34.bb (renamed from poky/meta/recipes-devtools/file/file_5.32.bb) | 8 |
2 files changed, 5 insertions, 42 deletions
diff --git a/poky/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch b/poky/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch deleted file mode 100644 index 8a16b2cf7..000000000 --- a/poky/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 08abf944b2bff27b6dd325dd15b4861cebef113a Mon Sep 17 00:00:00 2001 -From: Junling Zheng <zhengjunling@huawei.com> -Date: Wed, 8 Apr 2015 03:26:57 +0000 -Subject: [PATCH] Add -P prompt into Usage info - -Currently, Usage info doesn't include -P prompt, add it: - -root@arma9el:~# file -Usage: file [-bcEhikLlNnprsvz0] [--apple] [--mime-encoding] [--mime-type] - [-e testname] [-F separator] [-f namefile] [-m magicfiles] - [-P parameter=limits] file ... - file -C [-m magicfiles] - file [--help] - -Upstream-Status: Submitted - -Signed-off-by: Junling Zheng <zhengjunling@huawei.com> ---- - src/file.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/file.c b/src/file.c -index 2b15e21..e5a957b 100644 ---- a/src/file.c -+++ b/src/file.c -@@ -76,8 +76,8 @@ int getopt_long(int argc, char * const *argv, const char *optstring, const struc - # define USAGE \ - "Usage: %s [" FILE_FLAGS \ - "] [--apple] [--extension] [--mime-encoding] [--mime-type]\n" \ -- " [-e testname] [-F separator] [-f namefile] [-m magicfiles] " \ -- "file ...\n" \ -+ " [-e testname] [-F separator] [-f namefile] [-m magicfiles]\n " \ -+ " [-P parameter=limits] file ...\n" \ - " %s -C [-m magicfiles]\n" \ - " %s [--help]\n" - --- -1.8.3.4 - diff --git a/poky/meta/recipes-devtools/file/file_5.32.bb b/poky/meta/recipes-devtools/file/file_5.34.bb index 5e1592512..5d92913cb 100644 --- a/poky/meta/recipes-devtools/file/file_5.32.bb +++ b/poky/meta/recipes-devtools/file/file_5.34.bb @@ -16,13 +16,15 @@ UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)" SRC_URI = "git://github.com/file/file.git \ file://debian-742262.patch \ - file://0001-Add-P-prompt-into-Usage-info.patch \ " -SRCREV = "d474e35513940dbca039b510b4de705b44f5bd9c" +SRCREV = "315cef2f699da3c31a54bd3c6c6070680fbaf1f5" S = "${WORKDIR}/git" -inherit autotools +inherit autotools update-alternatives + +ALTERNATIVE_${PN} = "file" +ALTERNATIVE_LINK_NAME[file] = "${bindir}/file" EXTRA_OEMAKE_append_class-target = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" EXTRA_OEMAKE_append_class-nativesdk = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" |