diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-16 17:11:34 -0800 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-08 18:21:44 -0500 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.gz talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.zip |
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 'meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch b/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch deleted file mode 100644 index 95bd047b9..000000000 --- a/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch +++ /dev/null @@ -1,67 +0,0 @@ -Get linux kernel version from Makefile of kernel source - -We get below messages while building iscsitarget, - --- snip -- -x86_64-poky-linux-gcc: error: -/CGE7_SHDD/project_yocto_1.8/poky/build/tmp/work-shared/qemux86-64/kernel-source/include/linux/version.h: -No such file or directory -x86_64-poky-linux-gcc: fatal error: no input files -compilation terminated. -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments --- CUT -- - -These messages are due to absence of include/linux/version.h file in -kernel source directory and failed to compute linux kernel version. -So, use kernel source Makefile ( i.e $(KSRC)/Makefile) to find out -actual kernel version. - -Upstream-Status: Pending - -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> - ---- iscsitarget-1.4.20.3+svn499_org/Makefile 2014-01-27 00:00:45.000000000 +0530 -+++ iscsitarget-1.4.20.3+svn499/Makefile 2015-07-23 10:44:47.013600285 +0530 -@@ -18,27 +18,11 @@ ifeq ($(KSRC),) - endif - - --ifneq ($(wildcard $(KSRC)/include/generated/utsrelease.h),) -- VERSION_FILE := $(KSRC)/include/generated/utsrelease.h --else -- ifneq ($(wildcard $(KSRC)/include/linux/utsrelease.h),) -- VERSION_FILE := $(KSRC)/include/linux/utsrelease.h -- else -- VERSION_FILE := $(KSRC)/include/linux/version.h -- endif --endif -- --KVER := $(shell $(CC) $(CFLAGS) $(LDFLAGS) -E -dM $(VERSION_FILE) | \ -- grep UTS_RELEASE | awk '{ print $$3 }' | sed 's/\"//g') -- - KMOD := /lib/modules/$(KVER)/extra -- --KMAJ := $(shell echo $(KVER) | \ -- sed -e 's/^\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*.*/\1/') --KMIN := $(shell echo $(KVER) | \ -- sed -e 's/^[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*.*/\1/') --KREV := $(shell echo $(KVER) | \ -- sed -e 's/^[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/') -+KMAJ := $(shell cat $(KSRC)/Makefile | grep ^VERSION | gawk -F " " '{ print $$NF }') -+KMIN := $(shell cat $(KSRC)/Makefile | grep ^PATCHLEVEL | gawk -F " " '{ print $$NF }') -+KREV := $(shell cat $(KSRC)/Makefile | grep ^SUBLEVEL | gawk -F " " '{ print $$NF }') -+KVER := ${KMAJ}.${KMIN}.${KREV} - - kver_eq = $(shell [ $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -eq $(3) ] && \ - echo 1 || echo 0) |