Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
meta-elphel393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
meta-elphel393
Commits
b12b3b0a
Commit
b12b3b0a
authored
Jul 23, 2019
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed kernel building
parent
26451188
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
linux-xlnx_2018.3.bbappend
recipes-kernel/linux/linux-xlnx_2018.3.bbappend
+11
-9
No files found.
recipes-kernel/linux/linux-xlnx_2018.3.bbappend
View file @
b12b3b0a
...
...
@@ -4,11 +4,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/config:"
SRC_URI_append += " file://garmin_usb.c.patch"
#SRC_URI_append += " file://xilinx_emacps.c.patch"
#SRC_URI_append += " file://xilinx_uartps.c.patch"
SRC_URI_append += " file://si5338_vsc330x.patch"
#
SRC_URI_append += " file://si5338_vsc330x.patch"
SRC_URI_append += " file://drivers-elphel.patch"
SRC_URI_append += " file://ahci.patch"
SRC_URI_append += " file://libahci.patch"
SRC_URI_append += " file://libata-eh.c.patch"
#
SRC_URI_append += " file://libata-eh.c.patch"
SRC_URI_append += " file://${MACHINE}.scc"
KERNEL_FEATURES_append = " ${MACHINE}.scc"
...
...
@@ -20,7 +20,8 @@ linux-elphel_branch= "master"
linux-elphel_gitdir= "${WORKDIR}/linux-elphel"
# linux xilinx hash
SRCREV = "9c2e29b2c81dbb1efb7ee4944b18e12226b97513"
#SRCREV = "9c2e29b2c81dbb1efb7ee4944b18e12226b97513"
SRCREV = "eeab73d1207d6fc2082776c954eb19fd7290bfbe"
# To use the latest leave: "" - (=empty)
linux-elphel_srcrev= ""
...
...
@@ -100,22 +101,22 @@ do_deploy_append(){
# ROCKO: "uImage-" had to be added?!
if [ -f ${DEPLOYDIR}/uImage-${KERNEL_IMAGE_
BASE_
NAME}.bin ]; then
if [ -f ${DEPLOYDIR}/uImage-${KERNEL_IMAGE_NAME}.bin ]; then
if [ -f ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} ]; then
rm ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
fi
cp ${DEPLOYDIR}/uImage-${KERNEL_IMAGE_
BASE_
NAME}.bin ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
cp ${DEPLOYDIR}/uImage-${KERNEL_IMAGE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
else
echo "NOT 3 FOUND!"
fi
# copy initramfs image over initramfsless image - why?
if [ -f ${DEPLOYDIR}/uImage-${INITRAMFS_
BAS
E_NAME}.bin ]; then
if [ -f ${DEPLOYDIR}/uImage-${INITRAMFS_
IMAG
E_NAME}.bin ]; then
if [ -f ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} ]; then
rm ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
fi
cp ${DEPLOYDIR}/uImage-${INITRAMFS_
BAS
E_NAME}.bin ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
cp ${DEPLOYDIR}/uImage-${INITRAMFS_
IMAG
E_NAME}.bin ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL}
fi
done
}
...
...
@@ -141,7 +142,7 @@ do_bundle_initramfs_old () {
# Override kernel_do_compile used by do_bundle_initramfs in kernel.bbclass
# Added ${PARALLEL_MAKE} only
kernel_do_compile() {
kernel_do_compile
_old
() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
# The $use_alternate_initrd is only set from
...
...
@@ -178,7 +179,8 @@ ELPHEL_PE = "${@version_update('${VPATH}','${VFILE}',0)}"
ELPHEL_PV = "${@version_update('${VPATH}','${VFILE}',1)}"
ELPHEL_PR = "${@version_update('${VPATH}','${VFILE}',2)}"
FILES_kernel-image += " /etc/*"
#FILES_kernel-image += " /etc/*"
FILES_${KERNEL_PACKAGE_NAME}-image += " /etc/*"
do_install_append() {
install -d ${D}/etc/elphel393/packages
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment