Re: [yocto] [meta-cgl][PATCH 1/2] core-image-cgl/core-image-cgl-initramfs: remove them
ping
On 9/17/19 4:04 PM, changqing...@windriver.com wrote:
From: Changqing Li
remove core-image-cgl.bb and core-image-cgl-initramfs.bb
* They require core-image-lsb.bb which has been removed by oe-core
* Even before LSB support is dropped by oe-core, core-image-cgl
and core-image-cgl-initramfs cannot build success, failed during
do_rootfs with below error, so I suppose that no one use these
2 recipes, so remove it
Error:
Problem: package logcheck-1.3.20-r0.core2_64 requires rsyslog, but none of
the providers can be installed
- package rsyslog-8.1907.0-r0.core2_64 conflicts with sysklogd provided by
sysklogd-1.5.1-r0.core2_64
- package sysklogd-1.5.1-r0.core2_64 conflicts with rsyslog provided by
rsyslog-8.1907.0-r0.core2_64
- package packagegroup-cgl-applications-1.0-r0.noarch requires logcheck, but
none of the providers can be installed
- package packagegroup-core-full-cmdline-initscripts-1.0-r6.noarch requires
sysklogd, but none of the providers can be installed
- package packagegroup-cgl-1.0-r0.noarch requires
packagegroup-cgl-applications, but none of the providers can be installed
- package packagegroup-core-full-cmdline-1.0-r6.noarch requires
packagegroup-core-full-cmdline-initscripts, but none of the providers can be
installed
Signed-off-by: Changqing Li
---
meta-cgl-common/images/core-image-cgl-initramfs.bb | 19 ---
meta-cgl-common/images/core-image-cgl.bb | 28 --
2 files changed, 47 deletions(-)
delete mode 100644 meta-cgl-common/images/core-image-cgl-initramfs.bb
delete mode 100644 meta-cgl-common/images/core-image-cgl.bb
diff --git a/meta-cgl-common/images/core-image-cgl-initramfs.bb
b/meta-cgl-common/images/core-image-cgl-initramfs.bb
deleted file mode 100644
index 67cb4c1..000
--- a/meta-cgl-common/images/core-image-cgl-initramfs.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require core-image-cgl.bb
-
-# Recipe is based on core-image-minimal.bb
-DESCRIPTION = "Initramfs used to mount multipath device as root file system"
-
-PACKAGE_INSTALL = "initramfs-cgl-boot busybox base-passwd udev"
-
-# Do not pollute the initrd image with rootfs features
-IMAGE_FEATURES = ""
-
-export IMAGE_BASENAME = "core-image-cgl-initramfs"
-IMAGE_LINGUAS = ""
-
-LICENSE = "MIT"
-IMAGE_FSTYPES ??= "cpio.gz.u-boot"
-
-IMAGE_ROOTFS_SIZE = "8192"
-
-BAD_RECOMMENDATIONS += "busybox-syslog"
diff --git a/meta-cgl-common/images/core-image-cgl.bb
b/meta-cgl-common/images/core-image-cgl.bb
deleted file mode 100644
index 86bf7d4..000
--- a/meta-cgl-common/images/core-image-cgl.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-require recipes-extended/images/core-image-lsb.bb
-
-
-VALGRIND ?= ""
-VALGRIND_powerpc ?= "valgrind"
-VALGRIND_e500v2 ?= ""
-VALGRIND_x86 ?= "valgrind"
-VALGRIND_x86_64 ?= "valgrind"
-VALGRIND_armv7a ?= "valgrind"
-
-# Include modules in rootfs
-IMAGE_INSTALL += "\
-packagegroup-core-buildessential \
-packagegroup-core-selinux \
-packagegroup-cgl \
-kexec-tools \
-lttng-tools \
-lttng-modules \
-${VALGRIND} \
-"
-
-IMAGE_FSTYPES += " ext3.gz"
-
-# kexec-tools doesn't work on Mips
-KEXECTOOLS_mips ?= ""
-KEXECTOOLS_mipsel ?= ""
-
-IMAGE_FEATURES += "tools-debug tools-profile"
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-cgl][PATCH 2/2] ocfs2-tools: Remove lsb from RDEPENDS
ping
On 9/17/19 4:04 PM, changqing...@windriver.com wrote:
From: Changqing Li
The lsb had been removed from oe-core, and the "systemctl start o2cb/ocfs2"
works well after patched, when systemd (no /etc/init.d/functions, either), so
remove the unneeded line.
Signed-off-by: Robert Yang
Signed-off-by: Changqing Li
---
...sh-Remove-unneeded-lib-lsb-init-functions.patch | 32 ++
.../recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb | 7 ++---
2 files changed, 34 insertions(+), 5 deletions(-)
create mode 100644
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch
diff --git
a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch
new file mode 100644
index 000..5609b4b
--- /dev/null
+++
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch
@@ -0,0 +1,32 @@
+From b7913a62e2d78fa98ae2c475de4cc697519181e2 Mon Sep 17 00:00:00 2001
+From: Robert Yang
+Date: Tue, 10 Sep 2019 19:29:16 -0700
+Subject: [PATCH] o2cb.init.sh: Remove unneeded /lib/lsb/init-functions
+
+The "systemctl start o2cb/ocfs2" works well when systemd (no
+/etc/init.d/functions, either), so remove the unneeded line.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang
+---
+ vendor/common/o2cb.init.sh | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/vendor/common/o2cb.init.sh b/vendor/common/o2cb.init.sh
+index 8b0dbf09..49eb9a4c 100755
+--- a/vendor/common/o2cb.init.sh
b/vendor/common/o2cb.init.sh
+@@ -25,9 +25,6 @@ then
+ start_daemon () {
+ daemon $*
+ }
+-else
+-# Let's try to use the LSB functions
+-. /lib/lsb/init-functions
+ fi
+
+ if [ $? != 0 ]
+--
+2.21.0
+
diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
index a0376ec..d64c868 100644
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
+++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
@@ -21,6 +21,7 @@ SRC_URI = "git://github.com/markfasheh/ocfs2-tools \
file://ocfs2.service \
file://0001-Fix-build-with-glibc-2.28.patch \
file://0001-mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch \
+file://0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch \
"
SRCREV = "f1b4d073f08679f97b64b3eb88e586032f92a701"
S = "${WORKDIR}/git"
@@ -32,11 +33,7 @@ DEPENDS = "corosync pacemaker \
e2fsprogs e2fsprogs-native \
"
-# lsbinitscripts are needed to replace /etc/init.d/functions supplied by initscripts (systemv)
-# They are not the same code!
-#
-RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs
chkconfig glib-2.0 \
-
${@bb.utils.contains('DISTRO_FEATURES','systemd','lsbinitscripts','',d)}"
+RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs chkconfig
glib-2.0"
ASNEEDED_pn-${PN} = ""
PARALLEL_MAKE = ""
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-dpdk][PATCH] dpdk: support usrmerge
On 8/30/19 2:43 PM, Mittal, Anuj wrote:
On Fri, 2019-08-30 at 13:58 +0800, changqing...@windriver.com wrote:
-export
MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
+export MODULE_DIR="${@bb.utils.contains('DISTRO_FEATURES','usrmerge'
,'/usr','',d)}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
export RTE_SDK = "${S}"
Should this be:
MODULE_DIR =
"${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net"
It should then be handled automatically. Can you please check?
you are right, it can write like this. I will send a V2
Thanks,
Anuj
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-cloud-services][PATCH 1/14] glusterfs: support usrmerge [LINUXEXEC-1807]
Please ignore this mail
On 8/30/19 2:09 PM, changqing...@windriver.com wrote:
From: Changqing Li
Issue: LINUXEXEC-1807
(LOCAL REV: NOT UPSTREAM) -- send upstream 20190830
Signed-off-by: Changqing Li
---
recipes-extended/glusterfs/glusterfs.inc | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/recipes-extended/glusterfs/glusterfs.inc
b/recipes-extended/glusterfs/glusterfs.inc
index 40a3922..66e2bf1 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -64,9 +64,11 @@ do_install_append() {
install -m 0755 ${WORKDIR}/glusterd.init \
${D}${sysconfdir}/init.d/glusterd
-# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
-mkdir -p ${D}${base_sbindir}
-(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)};
then
+# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
+mkdir -p ${D}${base_sbindir}
+(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+fi
# These are plug-ins, so they don't need libtool configs.
find ${D}${libdir}/glusterfs/${PV} -name '*.la' -exec rm -f '{}' ';'
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [patchtest][PATCH V2] patchtest: fix linux-yocto version
Hi, Richard
This patchset need to be merged.
patchtest: fix linux-yocto version
and patchtest: fix virtio-9p-pci is not a valid device
Thanks
On 6/13/19 5:16 PM, changqing...@windriver.com wrote:
From: Changqing Li
4.9 is not avaiable currently, so remove version from bbappend
and remove PREFERRED_VERSION.
Signed-off-by: Changqing Li
---
.../linux/{linux-yocto_4.%.bbappend => linux-yocto_%.bbappend} | 0
scripts/create-guest-machine | 5 -
2 files changed, 5 deletions(-)
rename meta-patchtest/recipes-kernel/linux/{linux-yocto_4.%.bbappend =>
linux-yocto_%.bbappend} (100%)
diff --git a/meta-patchtest/recipes-kernel/linux/linux-yocto_4.%.bbappend
b/meta-patchtest/recipes-kernel/linux/linux-yocto_%.bbappend
similarity index 100%
rename from meta-patchtest/recipes-kernel/linux/linux-yocto_4.%.bbappend
rename to meta-patchtest/recipes-kernel/linux/linux-yocto_%.bbappend
diff --git a/scripts/create-guest-machine b/scripts/create-guest-machine
index 8dd6a2e..8381ef8 100755
--- a/scripts/create-guest-machine
+++ b/scripts/create-guest-machine
@@ -145,11 +145,6 @@ cat >> $POKY/build/conf/auto.conf << EOF
$PTSMARK
MACHINE = "$MACHINE"
-# The preferred kernel version in poky (4.10%, master) returns an error whilst
-# executing patchtest on guest. Changing the preferred version to 4.9% as it
-# is more suitable and does not present any errors.
-PREFERRED_VERSION_linux-yocto_qemux86-64 = "4.9%"
-
PACKAGE_CLASSES = "package_ipk"
IMAGE_FSTYPES = "ext4"
SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/dev/PATH;
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH V3] update-rc.d: support enable/disable options
On 6/20/19 3:28 PM, richard.pur...@linuxfoundation.org wrote: On Thu, 2019-06-20 at 10:07 +0800, Changqing Li wrote: Please also help to review this patch, Thanks. This patch needs to go to OE-Core for the bbclass part. The documentation piece needs to be separated out as its a different repository. Also doesn't it depend on the change I just made to the update-rc.d repo so there will be a SRCREV that needs to be updated that this depends on? I will split the oe-core and document part. without change in update-rc.d.bbclass, new function add in update-rc.d repo will not work. since preinst in update-rc.d.bbclass will delete all the links under rcrunlevel.d, this behavior conflicts with enable/disable options. and you're right, I also need to update SRCREV of update-rc.d.bb in oe-core repo. Thanks. I will send it later. Thanks, Richard -- BRs Sandy(Li Changqing) -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH V3] update-rc.d: support enable/disable options
Please also help to review this patch, Thanks.
On 4/30/19 2:56 PM, changqing...@windriver.com wrote:
From: Changqing Li
* update-rc.d has added support of enable/disable options, which are
expected to keep the previous configuration even after upgrade the packages.
With support for these options, it will only create start/stop link
when there are none, or it will keep the previous configuration.
Our preinst uses "-f remove" to remove any links under the /etc/rcrunlevel.d
which is conflicting behavior with disable/enable options, so remove it.
For example, if a user disabled one service before upgrade,
then after upgrade the service could be started. This happens because during
preinst,
all links have been deleted, then postinst may create the link to start
service.
With this change, we remove preinst and therefore keep the previous links
so that after upgrade, if a link existed for the package, then the postinst
will not create new start/stop links.
* remove '-f' for postinst. Previously, the keepalived recipe used 'remove'
during postinst, so we needed the -f, but now the keepalived recipe has fixed
this problem, so it's safe to remove '-f'.
[Yocto #12955]
Signed-off-by: Changqing Li
---
documentation/ref-manual/ref-variables.xml | 2 +-
meta/classes/update-rc.d.bbclass | 28
2 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/documentation/ref-manual/ref-variables.xml
b/documentation/ref-manual/ref-variables.xml
index 536bd15..8fc48c3 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -7243,7 +7243,7 @@
to the update-rc.d command.
For more information on valid parameters, please see the
update-rc.d manual page at
-.
+.
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 265c4be..1366fee 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -20,28 +20,14 @@ def use_updatercd(d):
return '[ -n "$D" -o ! -d /run/systemd/system ]'
return 'true'
-updatercd_preinst() {
-if ${@use_updatercd(d)} && [ -z "$D" -a -f "${INIT_D_DIR}/${INITSCRIPT_NAME}"
]; then
- ${INIT_D_DIR}/${INITSCRIPT_NAME} stop || :
-fi
-if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
- if [ -n "$D" ]; then
- OPT="-f -r $D"
- else
- OPT="-f"
- fi
- update-rc.d $OPT ${INITSCRIPT_NAME} remove
-fi
-}
-
PACKAGE_WRITE_DEPS += "update-rc.d-native"
updatercd_postinst() {
if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
if [ -n "$D" ]; then
- OPT="-f -r $D"
+ OPT="-r $D"
else
- OPT="-f -s"
+ OPT="-s"
fi
update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
fi
@@ -79,7 +65,7 @@ python __anonymous() {
PACKAGESPLITFUNCS_prepend = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit',
'populate_packages_updatercd ', '', d)}"
PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd "
-populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_preinst updatercd_postinst"
+populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm
updatercd_postinst"
populate_packages_updatercd[vardepsexclude] += "OVERRIDES"
python populate_packages_updatercd () {
@@ -95,7 +81,7 @@ python populate_packages_updatercd () {
d.appendVar('RDEPENDS_' + pkg, ' %sinitd-functions' % (mlprefix))
def update_rcd_package(pkg):
-bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm
for %s' % pkg)
+bb.debug(1, 'adding update-rc.d calls to postinst/prerm/postrm for %s'
% pkg)
localdata = bb.data.createCopy(d)
overrides = localdata.getVar("OVERRIDES")
@@ -103,12 +89,6 @@ python populate_packages_updatercd () {
update_rcd_auto_depend(pkg)
-preinst = d.getVar('pkg_preinst_%s' % pkg)
-if not preinst:
-preinst = '#!/bin/sh\n'
-preinst += localdata.getVar('updatercd_preinst')
-d.setVar('pkg_preinst_%s' % pkg, preinst)
-
postinst = d.getVar('pkg_postinst_%s' % pkg)
if not postinst:
postinst = '#!/bin/sh\n'
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [update-rc.d][PATCH V3] update-rc.d: support enable/disable options
On 6/19/19 10:43 PM, Richard Purdie wrote: On Tue, 2019-04-30 at 14:56 +0800, changqing...@windriver.com wrote: From: Changqing Li Add support of enable/disable options, refer https://manpages.debian.org/wheezy/sysv-rc/update-rc.d.8.en.html With support of these options, the usr can never change an existing configuration even after upgrading a package. The program will only install links if none are present, otherwise, it will keep the previous configuration. preinst in update-rc.d.bbclass will delete all the links under rcrunlevel.d, this behavior now conflicts with enable/disable options. so remove preinst from the update-rc.d.bbclass [Yocto 12955] Signed-off-by: Changqing Li Merged, thanks, sorry about the delay. Richard Thanks, Richard. I see this patch have merged into repo update-rc.d. But in this patch series, there are 2 patches, please also help to review the other one. Maybe this patch series seems a little messy in the mail. I will reply on the other patch for you to pick it out easily. -- BRs Sandy(Li Changqing) -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [update-rc.d][PATCH V3] update-rc.d: support enable/disable options
ping
On 5/28/19 8:59 AM, Changqing Li wrote:
ping
On 4/30/19 2:56 PM, changqing...@windriver.com wrote:
From: Changqing Li
Add support of enable/disable options, refer
https://manpages.debian.org/wheezy/sysv-rc/update-rc.d.8.en.html
With support of these options, the usr can never change an existing
configuration even after upgrading a package. The program will only
install links if none are present, otherwise, it will keep
the previous configuration.
preinst in update-rc.d.bbclass will delete all the links under
rcrunlevel.d, this behavior now conflicts with enable/disable
options. so remove preinst from the update-rc.d.bbclass
[Yocto 12955]
Signed-off-by: Changqing Li
---
update-rc.d | 81
+
1 file changed, 81 insertions(+)
diff --git a/update-rc.d b/update-rc.d
index e07cf85..a7fb7bc 100644
--- a/update-rc.d
+++ b/update-rc.d
@@ -27,6 +27,7 @@ usage()
usage: update-rc.d [-n] [-f] [-r ] remove
update-rc.d [-n] [-r ] [-s] defaults [NN |
sNN kNN]
update-rc.d [-n] [-r ] [-s] start|stop NN
runlvl [runlvl] [...] .
+ update-rc.d [-n] [-r ] [-s] enable|disable
[S|2|3|4|5]
-n: not really
-f: force
-v: verbose
@@ -101,6 +102,53 @@ makelinks()
done
}
+# function to disable/enable init script link of one run level
+# $1 should be K/S, means to disable/enable
+# $2 means which run level to disable/enable
+renamelink()
+{
+ local oldstartstop newstartstop lev oldnn newnn
+ if [ "x$1" = "xS" ]; then
+ oldstartstop="K"
+ newstartstop="S"
+ else
+ oldstartstop="S"
+ newstartstop="K"
+ fi
+
+ lev=$2
+ # modifies existing runlevel links for the script
/etc/init.d/name by renaming start links to stop link
+ # or stop link to start link with a sequence number equal to
the difference of 100 minus the original sequence number.
+ if ls ${etcd}${lev}.d/${oldstartstop}*${bn} >/dev/null 2>&1; then
+ oldnn=`basename ${etcd}${lev}.d/${oldstartstop}*${bn}|cut
-c2-3`
+ newnn=$[100-$oldnn]
+ [ $verbose -eq 1 ] && echo "rename
${etcd}${lev}.d/${oldstartstop}${oldnn}${bn} ->
${etcd}${lev}.d/${newstartstop}${newnn}${bn}"
+ if [ $notreally -eq 0 ];then
+ mv ${etcd}${lev}.d/${oldstartstop}${oldnn}${bn}
${etcd}${lev}.d/${newstartstop}${newnn}${bn}
+ fi
+ if [ $dostart -eq 1 ] && [ $newstartstop = "S" ] && [ $lev =
$RUNLEVEL ]; then
+ $fn start || true
+ fi
+ fi
+
+}
+
+# function to disable/enable init script link
+# $1 should be K/S, means to disable/enable
+# $2 run level [S|2|3|4|5], optional, If no start runlevel is
+# specified after the disable or enable keywords
+# the script will attempt to modify links in all start runlevels
+renamelinks()
+{
+ if [ $# -eq 2 ]; then
+ renamelink $1 $2
+ else
+ for i in 2 3 4 5 S; do
+ renamelink $1 $i
+ done
+ fi
+}
+
while [ $# -gt 0 ]; do
case $1 in
-n) notreally=1
@@ -221,6 +269,13 @@ case $1 in
;;
start | stop)
+ if [ $# -lt 4 ]
+ then
+ echo "Not enough arguments"
+ usage
+ exit 1
+ fi
+
while [ $# -gt 0 ]; do
if [ $1 = "start" ]; then
letter=S
@@ -251,6 +306,32 @@ case $1 in
makelinks
;;
+ enable | disable)
+ if [ $1 = "enable" ]; then
+ letter=S
+ elif [ $1 = "disable" ]; then
+ letter=K
+ else
+ usage
+ exit 1
+ fi
+ shift
+ #
+ if [ $# -gt 0 ]
+ then
+ case $1 in
+ S|2|3|4|5)
+ renamelinks $letter $1
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+ else
+ renamelinks $letter
+ fi
+ ;;
*)
usage
exit 1
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [patchtest][PATCH 2/2] patchtest: fix linux-yocto version
On 6/13/19 4:29 PM, Adrian Bunk wrote: On Thu, Jun 13, 2019 at 03:46:04PM +0800, changqing...@windriver.com wrote: From: Changqing Li 4.9 is not avaiable currently, preferred version changed to 5.0, also correct the bbappend name 5.0 is already EOL upstream and will be removed soon. ... --- a/scripts/create-guest-machine +++ b/scripts/create-guest-machine @@ -145,10 +145,7 @@ cat >> $POKY/build/conf/auto.conf << EOF $PTSMARK MACHINE = "$MACHINE" -# The preferred kernel version in poky (4.10%, master) returns an error whilst -# executing patchtest on guest. Changing the preferred version to 4.9% as it -# is more suitable and does not present any errors. -PREFERRED_VERSION_linux-yocto_qemux86-64 = "4.9%" +PREFERRED_VERSION_linux-yocto_qemux86-64 = "5.0%" ... This looks as if it was a temporary workaround for some problem with kernel 4.10. If 5.0 works, then there is not really a reason for changing the preferred version here. Thanks, I will remove this line. cu Adrian -- BRs Sandy(Li Changqing) -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH 1/2] patchtest: fix virtio-9p-pci is not a valid device
Please ignore this one, I resend one. On 6/13/19 3:45 PM, changqing...@windriver.com wrote: From: Changqing Li fix error during runqemu: test_mount: 'virtio-9p-pci' is not a valid device model name recipe qemu has been splited into qemu/qemu-native/qemu-sytem-native Signed-off-by: Changqing Li --- meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend | 1 + meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend delete mode 100644 meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend diff --git a/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend b/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend new file mode 100644 index 000..a91ccb7 --- /dev/null +++ b/meta-patchtest/recipes-devtools/qemu/qemu-system-native_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG_append = " virtfs" diff --git a/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend b/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend deleted file mode 100644 index 3ad9f03..000 --- a/meta-patchtest/recipes-devtools/qemu/qemu_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG_append_pn-qemu-native = " virtfs" -- BRs Sandy(Li Changqing) -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [patchtest-oe][PATCH] test_metadata_src_uri: new unittest detecting added patch files without modifying SRC_URI
On 5/28/19 10:53 PM, akuster wrote:
On 5/27/19 6:00 PM, Changqing Li wrote:
ping
On 4/29/19 2:10 PM, Changqing Li wrote:
ping
Does this mean you have a working knowledge of patchtest?
The one used by the project appears to be off line. Can you help?
kind regards,
Armin
I have do some work on this, and can try to help, but I don't have
access right of the server, and I also don't have the admin account of
the patchwork. if someone can provide these info, I am glad to help.
On 3/5/19 5:59 PM, changqing...@windriver.com wrote:
From: Changqing Li
Adds new unittest detecting when a patch file is added but no
corresponding
change to the SRC_URI is done.
This patch is from , get from
commit
49201c19cfe4cadd127b112d2858d5b28db49c20, this commit is reverted by
commit
6108d97f83b211f9eb245f339a412debd0ec5db4.
The added test case is ok, reason of series 9949 patchtest failed is:
recipe weston have REQUIRED_DISTRO_FEATURES, so parse recipe skipped,
cause self.modified is none, actually .bb is mofified, so make the
testcase failed.
during patchtest, we don't really need DISTRO_FEATURES, so fix the
problem
by set REQUIRED_DISTRO_FEATURES to "" in repo patchtest, meantime,
add this
testcase back.
[Yocto #13005]
Signed-off-by: Changqing Li
---
tests/test_metadata_src_uri.py | 25 +
1 file changed, 25 insertions(+)
diff --git a/tests/test_metadata_src_uri.py
b/tests/test_metadata_src_uri.py
index a4c5caa..f684ced 100644
--- a/tests/test_metadata_src_uri.py
+++ b/tests/test_metadata_src_uri.py
@@ -85,3 +85,28 @@ class SrcUri(base.Metadata):
'Amend the patch containing the
software patch file removal',
data=[('Patch', f) for f in
not_removed])
+ def test_src_uri_path_not_updated(self):
+ new_patches = set()
+ for patch in self.patchset:
+ if patch.is_added_file and patch.path.endswith('.patch'):
+ new_patches.add(os.path.basename(patch.path))
+
+ if not new_patches:
+ self.skip('No new patches added, skipping test')
+
+ if not self.modified:
+ self.fail('New patch path missing in SRC_URI',
+ "Add the patch path to the recipe's SRC_URI",
+ data=[('New patch(es)',
'\n'.join(new_patches))])
+
+ for pn in self.modified:
+ rd = self.tinfoil.parse_recipe(pn)
+
+ patchtestdata.PatchTestDataStore['%s-%s-%s' %
(self.shortid(), self.metadata, pn)] = rd.getVar(self.metadata)
+ test_src_uri =
patchtestdata.PatchTestDataStore['%s-%s-%s' % (self.shortid(),
self.metadata, pn)].split()
+ test_files = set([os.path.basename(patch) for patch
in test_src_uri if patch.startswith('file://')])
+
+ if not test_files.issuperset(new_patches):
+ self.fail('New patch path missing in SRC_URI',
+ "Add the patch path in the recipe's
SRC_URI",
+ data=[('New patch(es)', p) for p in
new_patches.difference(test_files)])
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [update-rc.d][PATCH V3] update-rc.d: support enable/disable options
ping
On 4/30/19 2:56 PM, changqing...@windriver.com wrote:
From: Changqing Li
Add support of enable/disable options, refer
https://manpages.debian.org/wheezy/sysv-rc/update-rc.d.8.en.html
With support of these options, the usr can never change an existing
configuration even after upgrading a package. The program will only
install links if none are present, otherwise, it will keep
the previous configuration.
preinst in update-rc.d.bbclass will delete all the links under
rcrunlevel.d, this behavior now conflicts with enable/disable
options. so remove preinst from the update-rc.d.bbclass
[Yocto 12955]
Signed-off-by: Changqing Li
---
update-rc.d | 81 +
1 file changed, 81 insertions(+)
diff --git a/update-rc.d b/update-rc.d
index e07cf85..a7fb7bc 100644
--- a/update-rc.d
+++ b/update-rc.d
@@ -27,6 +27,7 @@ usage()
usage: update-rc.d [-n] [-f] [-r ] remove
update-rc.d [-n] [-r ] [-s] defaults [NN | sNN kNN]
update-rc.d [-n] [-r ] [-s] start|stop NN runlvl
[runlvl] [...] .
+ update-rc.d [-n] [-r ] [-s] enable|disable [S|2|3|4|5]
-n: not really
-f: force
-v: verbose
@@ -101,6 +102,53 @@ makelinks()
done
}
+# function to disable/enable init script link of one run level
+# $1 should be K/S, means to disable/enable
+# $2 means which run level to disable/enable
+renamelink()
+{
+ local oldstartstop newstartstop lev oldnn newnn
+ if [ "x$1" = "xS" ]; then
+ oldstartstop="K"
+ newstartstop="S"
+ else
+ oldstartstop="S"
+ newstartstop="K"
+ fi
+
+ lev=$2
+ # modifies existing runlevel links for the script /etc/init.d/name by
renaming start links to stop link
+# or stop link to start link with a sequence number equal to the
difference of 100 minus the original sequence number.
+ if ls ${etcd}${lev}.d/${oldstartstop}*${bn} >/dev/null 2>&1; then
+ oldnn=`basename ${etcd}${lev}.d/${oldstartstop}*${bn}|cut -c2-3`
+ newnn=$[100-$oldnn]
+ [ $verbose -eq 1 ] && echo "rename
${etcd}${lev}.d/${oldstartstop}${oldnn}${bn} -> ${etcd}${lev}.d/${newstartstop}${newnn}${bn}"
+ if [ $notreally -eq 0 ];then
+ mv ${etcd}${lev}.d/${oldstartstop}${oldnn}${bn}
${etcd}${lev}.d/${newstartstop}${newnn}${bn}
+ fi
+ if [ $dostart -eq 1 ] && [ $newstartstop = "S" ] && [ $lev =
$RUNLEVEL ]; then
+ $fn start || true
+ fi
+ fi
+
+}
+
+# function to disable/enable init script link
+# $1 should be K/S, means to disable/enable
+# $2 run level [S|2|3|4|5], optional, If no start runlevel is
+# specified after the disable or enable keywords
+# the script will attempt to modify links in all start runlevels
+renamelinks()
+{
+ if [ $# -eq 2 ]; then
+ renamelink $1 $2
+ else
+ for i in 2 3 4 5 S; do
+ renamelink $1 $i
+ done
+ fi
+}
+
while [ $# -gt 0 ]; do
case $1 in
-n) notreally=1
@@ -221,6 +269,13 @@ case $1 in
;;
start | stop)
+ if [ $# -lt 4 ]
+ then
+ echo "Not enough arguments"
+ usage
+ exit 1
+ fi
+
while [ $# -gt 0 ]; do
if [ $1 = "start" ]; then
letter=S
@@ -251,6 +306,32 @@ case $1 in
makelinks
;;
+ enable | disable)
+ if [ $1 = "enable" ]; then
+ letter=S
+ elif [ $1 = "disable" ]; then
+ letter=K
+ else
+ usage
+ exit 1
+ fi
+ shift
+ #
+ if [ $# -gt 0 ]
+ then
+ case $1 in
+ S|2|3|4|5)
+ renamelinks $letter $1
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+ else
+ renamelinks $letter
+ fi
+ ;;
*)
usage
exit 1
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [patchtest-oe][PATCH] test_metadata_src_uri: new unittest detecting added patch files without modifying SRC_URI
ping
On 4/29/19 2:10 PM, Changqing Li wrote:
ping
On 3/5/19 5:59 PM, changqing...@windriver.com wrote:
From: Changqing Li
Adds new unittest detecting when a patch file is added but no
corresponding
change to the SRC_URI is done.
This patch is from , get from commit
49201c19cfe4cadd127b112d2858d5b28db49c20, this commit is reverted by
commit
6108d97f83b211f9eb245f339a412debd0ec5db4.
The added test case is ok, reason of series 9949 patchtest failed is:
recipe weston have REQUIRED_DISTRO_FEATURES, so parse recipe skipped,
cause self.modified is none, actually .bb is mofified, so make the
testcase failed.
during patchtest, we don't really need DISTRO_FEATURES, so fix the
problem
by set REQUIRED_DISTRO_FEATURES to "" in repo patchtest, meantime,
add this
testcase back.
[Yocto #13005]
Signed-off-by: Changqing Li
---
tests/test_metadata_src_uri.py | 25 +
1 file changed, 25 insertions(+)
diff --git a/tests/test_metadata_src_uri.py
b/tests/test_metadata_src_uri.py
index a4c5caa..f684ced 100644
--- a/tests/test_metadata_src_uri.py
+++ b/tests/test_metadata_src_uri.py
@@ -85,3 +85,28 @@ class SrcUri(base.Metadata):
'Amend the patch containing the
software patch file removal',
data=[('Patch', f) for f in
not_removed])
+ def test_src_uri_path_not_updated(self):
+ new_patches = set()
+ for patch in self.patchset:
+ if patch.is_added_file and patch.path.endswith('.patch'):
+ new_patches.add(os.path.basename(patch.path))
+
+ if not new_patches:
+ self.skip('No new patches added, skipping test')
+
+ if not self.modified:
+ self.fail('New patch path missing in SRC_URI',
+ "Add the patch path to the recipe's SRC_URI",
+ data=[('New patch(es)',
'\n'.join(new_patches))])
+
+ for pn in self.modified:
+ rd = self.tinfoil.parse_recipe(pn)
+
+ patchtestdata.PatchTestDataStore['%s-%s-%s' %
(self.shortid(), self.metadata, pn)] = rd.getVar(self.metadata)
+ test_src_uri =
patchtestdata.PatchTestDataStore['%s-%s-%s' % (self.shortid(),
self.metadata, pn)].split()
+ test_files = set([os.path.basename(patch) for patch
in test_src_uri if patch.startswith('file://')])
+
+ if not test_files.issuperset(new_patches):
+ self.fail('New patch path missing in SRC_URI',
+ "Add the patch path in the recipe's SRC_URI",
+ data=[('New patch(es)', p) for p in
new_patches.difference(test_files)])
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-mingw][PATCH V2] testsdk: enhance extract sdk part
Hi, Joshua
OE-core patch have merge to master:
https://git.openembedded.org/openembedded-core/commit/?id=57a33048a89a422cfdc986d3489c67b2d297e1e7
please help to merge this patch, thanks.
On 1/21/19 10:47 PM, Joshua Watt wrote:
Just FYI, I haven't forgot about this patch. I want to wait until the
dependent OE-core patch is at least in the master-next branch before I
apply this to the MinGW master-next branch. If you want to give me a
ping when the OE-core patch shows up in master-next, it would be very
helpful.
Thanks
On Thu, 2019-01-17 at 17:49 +0800, changqing...@windriver.com wrote:
From: Changqing Li
Current sdk type is tar.xz, but for mingw sdk, since we
have symlink under the sdk folder, 7zip which used to
extract tar.xz cannot handle it, refer 7zip upstream bug:
https://sourceforge.net/p/sevenzip/discussion/45797/thread/c71d6b96/
so oe-core have add support of change SDK type to .zip, so correct
the extract function.
Signed-off-by: Changqing Li
---
lib/oeqa/sdkmingw/testsdk.py | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/oeqa/sdkmingw/testsdk.py
b/lib/oeqa/sdkmingw/testsdk.py
index 85fe3c6..173cfd9 100644
--- a/lib/oeqa/sdkmingw/testsdk.py
+++ b/lib/oeqa/sdkmingw/testsdk.py
@@ -12,7 +12,7 @@ class TestSDKMinGW(TestSDK):
"""
Get the name of the SDK file
"""
-return
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz")
+return
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}")
def extract_sdk(self, tcname, sdk_dir, d):
"""
@@ -23,7 +23,14 @@ class TestSDKMinGW(TestSDK):
try:
# TODO: It would be nice to try and extract the SDK in
Wine to make
# sure it is well formed
-subprocess.check_output(['tar', '-xf', tcname, '-C',
sdk_dir])
+
+# TODO: Extract SDK according to SDK_ARCHIVE_TYPE, need
to change if
+# oe-core support other types.
+if d.getVar("SDK_ARCHIVE_TYPE") == "zip":
+subprocess.check_output(['unzip', '-d', sdk_dir,
tcname])
+else:
+subprocess.check_output(['tar', '-xf', tcname, '-C',
sdk_dir])
+
except subprocess.CalledProcessError as e:
bb.fatal("Couldn't install the SDK:\n%s" %
e.output.decode("utf-8"))
--
2.7.4
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [patchtest-oe][PATCH] test_metadata_src_uri: new unittest detecting added patch files without modifying SRC_URI
ping
On 3/5/19 5:59 PM, changqing...@windriver.com wrote:
From: Changqing Li
Adds new unittest detecting when a patch file is added but no corresponding
change to the SRC_URI is done.
This patch is from , get from commit
49201c19cfe4cadd127b112d2858d5b28db49c20, this commit is reverted by commit
6108d97f83b211f9eb245f339a412debd0ec5db4.
The added test case is ok, reason of series 9949 patchtest failed is:
recipe weston have REQUIRED_DISTRO_FEATURES, so parse recipe skipped,
cause self.modified is none, actually .bb is mofified, so make the testcase
failed.
during patchtest, we don't really need DISTRO_FEATURES, so fix the problem
by set REQUIRED_DISTRO_FEATURES to "" in repo patchtest, meantime, add this
testcase back.
[Yocto #13005]
Signed-off-by: Changqing Li
---
tests/test_metadata_src_uri.py | 25 +
1 file changed, 25 insertions(+)
diff --git a/tests/test_metadata_src_uri.py b/tests/test_metadata_src_uri.py
index a4c5caa..f684ced 100644
--- a/tests/test_metadata_src_uri.py
+++ b/tests/test_metadata_src_uri.py
@@ -85,3 +85,28 @@ class SrcUri(base.Metadata):
'Amend the patch containing the software patch
file removal',
data=[('Patch', f) for f in not_removed])
+def test_src_uri_path_not_updated(self):
+new_patches = set()
+for patch in self.patchset:
+if patch.is_added_file and patch.path.endswith('.patch'):
+new_patches.add(os.path.basename(patch.path))
+
+if not new_patches:
+self.skip('No new patches added, skipping test')
+
+if not self.modified:
+self.fail('New patch path missing in SRC_URI',
+ "Add the patch path to the recipe's SRC_URI",
+ data=[('New patch(es)', '\n'.join(new_patches))])
+
+for pn in self.modified:
+rd = self.tinfoil.parse_recipe(pn)
+
+patchtestdata.PatchTestDataStore['%s-%s-%s' % (self.shortid(),
self.metadata, pn)] = rd.getVar(self.metadata)
+test_src_uri= patchtestdata.PatchTestDataStore['%s-%s-%s' %
(self.shortid(), self.metadata, pn)].split()
+test_files= set([os.path.basename(patch) for patch in
test_src_uri if patch.startswith('file://')])
+
+if not test_files.issuperset(new_patches):
+self.fail('New patch path missing in SRC_URI',
+ "Add the patch path in the recipe's SRC_URI",
+ data=[('New patch(es)', p) for p in
new_patches.difference(test_files)])
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [patchtest][PATCH] core-image-patchtest: avoid skip parse recipe
ping
On 3/5/19 5:59 PM, changqing...@windriver.com wrote:
From: Changqing Li
patchtest [1] failed since the recipe is skipparsed since it defines
REQUIRED_DISTRO_FEATURES. patchtest don't really need
DISTRO_FEATURES, so fix the problem by set REQUIRED_DISTRO_FEATURES/
COMPATIBLE_MACHINE/COMPATIBLE_HOST to "" to avoid skip parse
[Yocto #13005]
[1] https://patchwork.openembedded.org/series/9949/
Signed-off-by: Changqing Li
---
meta-patchtest/recipes-core/images/core-image-patchtest.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-patchtest/recipes-core/images/core-image-patchtest.bb
b/meta-patchtest/recipes-core/images/core-image-patchtest.bb
index 47e4041..95279d2 100644
--- a/meta-patchtest/recipes-core/images/core-image-patchtest.bb
+++ b/meta-patchtest/recipes-core/images/core-image-patchtest.bb
@@ -30,6 +30,9 @@ TMPBUILD="\$(mktemp -d)"
BRANCH="\$(get-target-branch \$REPO \$MBOX | awk '{print \$NF}')"
cd \$REPO
source ./oe-init-build-env \$TMPBUILD
+echo "COMPATIBLE_MACHINE_qemuall = \\"\\"" >> \$TMPBUILD/conf/local.conf
+echo "COMPATIBLE_HOST_qemuall = \\"\\"" >> \$TMPBUILD/conf/local.conf
+echo "REQUIRED_DISTRO_FEATURES_qemuall = \\"\\"" >> \$TMPBUILD/conf/local.conf
test-mboxes -r \$REPO -s \$SUITESTART -m \$MBOX -o \$RESULTS -- --base-branch
\$BRANCH
rm -rf \$TMPBUILD
}
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH V2 0/2] update-rc.d: support enable/disable function
Ping On 1/21/19 5:09 PM, changqing...@windriver.com wrote: These three patches are for support disable/enable function for update-rc.d change in V2: add some comments and fix commit message change in V1: * change of script update-rc.d is for support disable/enable of init script link * update-rc.d.bbclass remove preinst to make disable/enable can work after upgrade * fix the doc manual Changqing Li (2): update-rc.d.bbclass: remove preinst and remove -f for postinst ref-variables.xml: update manual page for update-rc.d documentation/ref-manual/ref-variables.xml | 2 +- meta/classes/update-rc.d.bbclass | 28 2 files changed, 5 insertions(+), 25 deletions(-) -- BRs Sandy(Li Changqing) -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH V2] patchwork: Add a dockerfile for deploy patchwork and patchtest
Hi, Paul Are you maintaining this repo? On 2/10/19 2:43 AM, Jose Lamego wrote: Hi Randy, Sorry for the late response. I'm no longer involved with the Yocto Project. Last word I heard was that point of contact for Patchwork- related work was Paul Eggleton. Hope this helps. Jose Thanks. On Mon, 2019-01-28 at 20:30 -0500, Randy MacLeod wrote: On 1/16/19 12:37 AM, changqing...@windriver.com wrote: From: Changqing Li Ping? Jose, are you maintaining this repo? http://git.yoctoproject.org/cgit/cgit.cgi/patchwork/about/ You were the committer for most of the recent work. ../Randy Add a dockerfile for easy deploy patchwork and patchtest in docker Signed-off-by: Changqing Li --- Dockerfile.pw | 52 +++ README.pw | 32 ++ requirements.txt | 12 ++ scripts/pw_createsuperuser.sh | 5 + scripts/pw_getmail.sh | 11 + scripts/pw_migrate.sh | 5 + scripts/pw_runwebserver.sh| 12 ++ 7 files changed, 129 insertions(+) create mode 100644 Dockerfile.pw create mode 100644 README.pw create mode 100644 requirements.txt create mode 100755 scripts/pw_createsuperuser.sh create mode 100755 scripts/pw_getmail.sh create mode 100755 scripts/pw_migrate.sh create mode 100755 scripts/pw_runwebserver.sh diff --git a/Dockerfile.pw b/Dockerfile.pw new file mode 100644 index 000..ae3c1ee --- /dev/null +++ b/Dockerfile.pw @@ -0,0 +1,52 @@ +FROM ubuntu:latest +MAINTAINER owner + +EXPOSE 8080 + +ENV PYTHONUNBUFFERED=1 \ +LANG=en_US.UTF-8 \ +LC_ALL=en_US.UTF-8 \ +LC_CTYPE=en_US.UTF-8 \ +PATH="$PATH:/opt/patchwork/git- pw:/opt/patchtest:/opt/patchtest/scripts" + +RUN apt-get update \ +&& apt-get dist-upgrade -y \ +&& apt-get install -y --no-install-recommends \ +autoconf \ +gcc \ +g++ \ +make \ +locales \ +wget \ +curl \ +cron \ +python-pip \ +python-dev \ +python-setuptools \ +python3-pip \ +python3-dev \ +libmysqlclient-dev \ +git-core \ +getmail4 \ +&& sh -c "echo \"en_US.UTF-8 UTF-8\" >> /etc/locale.gen" \ +&& locale-gen en_US.UTF-8 \ +&& update-locale \ +&& pip2 install wheel \ +&& pip3 install wheel \ +&& pip3 install setuptools \ +&& apt-get autoremove --purge -y \ +&& rm -rf /var/lib/apt/lists/* \ +&& apt-get clean +ADD ./patchwork /opt/patchwork +ADD ./patchtest /opt/patchtest +ADD ./patchtest-oe /opt/patchtest-oe +ADD ./getmailrc /opt/getmail/getmailrc +RUN pip2 install -r /opt/patchwork/requirements.txt \ +&& pip3 install -r /opt/patchtest/requirements.txt \ +&& pip3 install -r /opt/patchtest-oe/requirements.txt \ +&& mkdir -p /opt/getmail \ +&& mkdir -p /opt/pw-logs \ +&& git config --global user.email "patcht...@patchtest.com" \ +&& git config --global user.name "patchtest" \ +&& /opt/patchtest/scripts/create-host-test-folder -t /opt/pw- test \ +&& /opt/patchtest/scripts/create-host-crontab -c /opt/pw-test- cron diff --git a/README.pw b/README.pw new file mode 100644 index 000..ffa7af1 --- /dev/null +++ b/README.pw @@ -0,0 +1,32 @@ +* Dockerfile.pw deploy patchwork, patchtest, patchtest-oe in docker + +* Dockerfile.pw is just an example, you can adjust according to your + deploy condition, like not use getmail, but use postfix. + +* requirements.txt, just for refer, you can also rewrite this + according to patchwork'doc and accoridng to your deploy condition. + +* scripts folder hold the files will be used during deploy with docker. + +* Deploy steps: + +1. Clone patchwork, patchtest, patchtest-oe first, also put getmailrc used by + Dockerfile.pw under the same folder. + +2. Build docker image with Dockerfile.pw +$docker build -t pw -f ./patchwork/Dockerfile.pw . + +3. use mariadb as dataserver: +$ docker pull mariadb +$ docker run -d --name pw-db -e MYSQL_ROOT_PASSWORD=123456 -e MYSQL_DATABASE=pwdb -v /pw/pwdb:/var/lib/mysql mariadb + +5. run web server +docker run -d --name pw-web --link pw-db:pw-db -p 8080:8080 pw "/opt/patchwork/scripts/pw_runwebserver.sh" + +6. config pw +docker exec -it pw-web /opt/patchwork/scripts/pw_migrate.sh +docker exec -it pw-web /opt/patchwork/scripts/pw_createsuperuser.sh + +7. run patchwork +docker run -d --name pw-mail --link pw-db:pw-db pw "/opt/patchwork/scripts/pw_getmail.sh" + diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000..b8f68f2 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,12 @@ +django==1.8.0 +sqlparse==0.2.4 +celery==3.1.20 +d
Re: [yocto] [meta-mingw][PATCH V2] testsdk: enhance extract sdk part
On 1/21/19 10:47 PM, Joshua Watt wrote:
Just FYI, I haven't forgot about this patch. I want to wait until the
dependent OE-core patch is at least in the master-next branch before I
apply this to the MinGW master-next branch. If you want to give me a
ping when the OE-core patch shows up in master-next, it would be very
helpful.
Thanks
Yes, I will do it.
On Thu, 2019-01-17 at 17:49 +0800, changqing...@windriver.com wrote:
From: Changqing Li
Current sdk type is tar.xz, but for mingw sdk, since we
have symlink under the sdk folder, 7zip which used to
extract tar.xz cannot handle it, refer 7zip upstream bug:
https://sourceforge.net/p/sevenzip/discussion/45797/thread/c71d6b96/
so oe-core have add support of change SDK type to .zip, so correct
the extract function.
Signed-off-by: Changqing Li
---
lib/oeqa/sdkmingw/testsdk.py | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/oeqa/sdkmingw/testsdk.py
b/lib/oeqa/sdkmingw/testsdk.py
index 85fe3c6..173cfd9 100644
--- a/lib/oeqa/sdkmingw/testsdk.py
+++ b/lib/oeqa/sdkmingw/testsdk.py
@@ -12,7 +12,7 @@ class TestSDKMinGW(TestSDK):
"""
Get the name of the SDK file
"""
-return
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz")
+return
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}")
def extract_sdk(self, tcname, sdk_dir, d):
"""
@@ -23,7 +23,14 @@ class TestSDKMinGW(TestSDK):
try:
# TODO: It would be nice to try and extract the SDK in
Wine to make
# sure it is well formed
-subprocess.check_output(['tar', '-xf', tcname, '-C',
sdk_dir])
+
+# TODO: Extract SDK according to SDK_ARCHIVE_TYPE, need
to change if
+# oe-core support other types.
+if d.getVar("SDK_ARCHIVE_TYPE") == "zip":
+subprocess.check_output(['unzip', '-d', sdk_dir,
tcname])
+else:
+subprocess.check_output(['tar', '-xf', tcname, '-C',
sdk_dir])
+
except subprocess.CalledProcessError as e:
bb.fatal("Couldn't install the SDK:\n%s" %
e.output.decode("utf-8"))
--
2.7.4
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-mingw][PATCH] mingw32-common: change mingw sdk to .zip type
Ross and Joshua, thanks for your comments, I will send a v2 later.
On 1/16/19 9:17 PM, Burton, Ross wrote:
Just in case you hadn't noticed, that this depends on a corresponding
patch to oe-core, which I've comments on.
Ross
On Wed, 16 Jan 2019 at 13:14, Joshua Watt wrote:
On Wed, Jan 16, 2019, 3:37 AM
From: Changqing Li
Current sdk type is tar.xz, but for mingw sdk, since we
have symlink under the sdk folder, 7zip which used to
extract tar.xz cannot handle it, refer 7zip upstream bug:
https://sourceforge.net/p/sevenzip/discussion/45797/thread/c71d6b96/
so change to .zip type
Also tried to use option --dereference of tar which use means:
"follow symlinks; archive and dump the files they point to"
with this option, when archive it will deal with symlink to hard link,
but windows not support hard link, so drop this solution,
and use .zip for windows.
Signed-off-by: Changqing Li
---
conf/machine-sdk/include/mingw32-common.inc | 5 +
1 file changed, 5 insertions(+)
diff --git a/conf/machine-sdk/include/mingw32-common.inc
b/conf/machine-sdk/include/mingw32-common.inc
index 9011ded..dbad50a 100644
--- a/conf/machine-sdk/include/mingw32-common.inc
+++ b/conf/machine-sdk/include/mingw32-common.inc
@@ -46,3 +46,8 @@ GCCPIE_mingw32 = ""
# wine and wineserver are required to test MinGW SDKs
HOSTTOOLS += "${@'wine wineserver' if (bb.utils.contains_any('IMAGE_CLASSES', 'testsdk', True, False, d) or
any(x in (d.getVar("BBINCLUDED") or "") for x in ["testsdk.bbclass"])) else ''}"
+# mingw sdk use .zip type
+SDK_TAR_TYPE = "zip"
+SDK_TAR_DEPENDS = "zip-native"
+SDK_TAR_CMD ?= "zip -r ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_TAR_TYPE}
."
+
You will also need to update the QA tests, since right now they expecting a tar
file (lib/oeqa/sdkmingw/testsdk.py)
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH] update-rc.d: support enable/disable function
Ping
On 12/5/18 4:13 PM, Changqing Li wrote:
ping
On 11/26/18 11:35 AM, Changqing Li wrote:
Ping
On 11/9/18 5:44 PM, changqing...@windriver.com wrote:
From: Changqing Li
Add support of enable/disable function, so that user can keep
previous config after upgrade package
Signed-off-by: Changqing Li
---
update-rc.d | 70
+
1 file changed, 70 insertions(+)
diff --git a/update-rc.d b/update-rc.d
index e07cf85..1ba97d3 100644
--- a/update-rc.d
+++ b/update-rc.d
@@ -27,6 +27,7 @@ usage()
usage: update-rc.d [-n] [-f] [-r ] remove
update-rc.d [-n] [-r ] [-s] defaults [NN |
sNN kNN]
update-rc.d [-n] [-r ] [-s] start|stop NN
runlvl [runlvl] [...] .
+ update-rc.d [-n] [-r ] [-s] enable|disable
[S|2|3|4|5]
-n: not really
-f: force
-v: verbose
@@ -101,6 +102,43 @@ makelinks()
done
}
+renamelink()
+{
+ local oldstartstop newstartstop lev oldnn newnn
+ if [ "x$1" = "xS" ]; then
+ oldstartstop="K"
+ newstartstop="S"
+ else
+ oldstartstop="S"
+ newstartstop="K"
+ fi
+
+ lev=$2
+ if ls ${etcd}${lev}.d/${oldstartstop}*${bn} >/dev/null 2>&1; then
+ oldnn=`basename ${etcd}${lev}.d/${oldstartstop}*${bn}|cut
-c2-3`
+ newnn=$[100-$oldnn]
+ [ $verbose -eq 1 ] && echo "rename
${etcd}${lev}.d/${oldstartstop}${oldnn}${bn} ->
${etcd}${lev}.d/${newstartstop}${newnn}${bn}"
+ if [ $notreally -eq 0 ];then
+ mv ${etcd}${lev}.d/${oldstartstop}${oldnn}${bn}
${etcd}${lev}.d/${newstartstop}${newnn}${bn}
+ fi
+ if [ $dostart -eq 1 ] && [ $newstartstop = "S" ] && [ $lev
= $RUNLEVEL ]; then
+ $fn start || true
+ fi
+ fi
+
+}
+
+renamelinks()
+{
+ if [ $# -eq 2 ]; then
+ renamelink $1 $2
+ else
+ for i in 2 3 4 5 S; do
+ renamelink $1 $i
+ done
+ fi
+}
+
while [ $# -gt 0 ]; do
case $1 in
-n) notreally=1
@@ -221,6 +259,13 @@ case $1 in
;;
start | stop)
+ if [ $# -lt 4 ]
+ then
+ echo "Not enough arguments"
+ usage
+ exit 1
+ fi
+
while [ $# -gt 0 ]; do
if [ $1 = "start" ]; then
letter=S
@@ -251,6 +296,31 @@ case $1 in
makelinks
;;
+ enable | disable)
+ if [ $1 = "enable" ]; then
+ letter=S
+ elif [ $1 = "disable" ]; then
+ letter=K
+ else
+ usage
+ exit 1
+ fi
+ shift
+ if [ $# -gt 0 ]
+ then
+ case $1 in
+ S|2|3|4|5)
+ renamelinks $letter $1
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+ else
+ renamelinks $letter
+ fi
+ ;;
*)
usage
exit 1
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH] update-rc.d: support enable/disable function
ping
On 11/26/18 11:35 AM, Changqing Li wrote:
Ping
On 11/9/18 5:44 PM, changqing...@windriver.com wrote:
From: Changqing Li
Add support of enable/disable function, so that user can keep
previous config after upgrade package
Signed-off-by: Changqing Li
---
update-rc.d | 70
+
1 file changed, 70 insertions(+)
diff --git a/update-rc.d b/update-rc.d
index e07cf85..1ba97d3 100644
--- a/update-rc.d
+++ b/update-rc.d
@@ -27,6 +27,7 @@ usage()
usage: update-rc.d [-n] [-f] [-r ] remove
update-rc.d [-n] [-r ] [-s] defaults [NN |
sNN kNN]
update-rc.d [-n] [-r ] [-s] start|stop NN
runlvl [runlvl] [...] .
+ update-rc.d [-n] [-r ] [-s] enable|disable
[S|2|3|4|5]
-n: not really
-f: force
-v: verbose
@@ -101,6 +102,43 @@ makelinks()
done
}
+renamelink()
+{
+ local oldstartstop newstartstop lev oldnn newnn
+ if [ "x$1" = "xS" ]; then
+ oldstartstop="K"
+ newstartstop="S"
+ else
+ oldstartstop="S"
+ newstartstop="K"
+ fi
+
+ lev=$2
+ if ls ${etcd}${lev}.d/${oldstartstop}*${bn} >/dev/null 2>&1; then
+ oldnn=`basename ${etcd}${lev}.d/${oldstartstop}*${bn}|cut
-c2-3`
+ newnn=$[100-$oldnn]
+ [ $verbose -eq 1 ] && echo "rename
${etcd}${lev}.d/${oldstartstop}${oldnn}${bn} ->
${etcd}${lev}.d/${newstartstop}${newnn}${bn}"
+ if [ $notreally -eq 0 ];then
+ mv ${etcd}${lev}.d/${oldstartstop}${oldnn}${bn}
${etcd}${lev}.d/${newstartstop}${newnn}${bn}
+ fi
+ if [ $dostart -eq 1 ] && [ $newstartstop = "S" ] && [ $lev =
$RUNLEVEL ]; then
+ $fn start || true
+ fi
+ fi
+
+}
+
+renamelinks()
+{
+ if [ $# -eq 2 ]; then
+ renamelink $1 $2
+ else
+ for i in 2 3 4 5 S; do
+ renamelink $1 $i
+ done
+ fi
+}
+
while [ $# -gt 0 ]; do
case $1 in
-n) notreally=1
@@ -221,6 +259,13 @@ case $1 in
;;
start | stop)
+ if [ $# -lt 4 ]
+ then
+ echo "Not enough arguments"
+ usage
+ exit 1
+ fi
+
while [ $# -gt 0 ]; do
if [ $1 = "start" ]; then
letter=S
@@ -251,6 +296,31 @@ case $1 in
makelinks
;;
+ enable | disable)
+ if [ $1 = "enable" ]; then
+ letter=S
+ elif [ $1 = "disable" ]; then
+ letter=K
+ else
+ usage
+ exit 1
+ fi
+ shift
+ if [ $# -gt 0 ]
+ then
+ case $1 in
+ S|2|3|4|5)
+ renamelinks $letter $1
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+ else
+ renamelinks $letter
+ fi
+ ;;
*)
usage
exit 1
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH] update-rc.d: support enable/disable function
Ping
On 11/9/18 5:44 PM, changqing...@windriver.com wrote:
From: Changqing Li
Add support of enable/disable function, so that user can keep
previous config after upgrade package
Signed-off-by: Changqing Li
---
update-rc.d | 70 +
1 file changed, 70 insertions(+)
diff --git a/update-rc.d b/update-rc.d
index e07cf85..1ba97d3 100644
--- a/update-rc.d
+++ b/update-rc.d
@@ -27,6 +27,7 @@ usage()
usage: update-rc.d [-n] [-f] [-r ] remove
update-rc.d [-n] [-r ] [-s] defaults [NN | sNN kNN]
update-rc.d [-n] [-r ] [-s] start|stop NN runlvl
[runlvl] [...] .
+ update-rc.d [-n] [-r ] [-s] enable|disable [S|2|3|4|5]
-n: not really
-f: force
-v: verbose
@@ -101,6 +102,43 @@ makelinks()
done
}
+renamelink()
+{
+ local oldstartstop newstartstop lev oldnn newnn
+ if [ "x$1" = "xS" ]; then
+ oldstartstop="K"
+ newstartstop="S"
+ else
+ oldstartstop="S"
+ newstartstop="K"
+ fi
+
+ lev=$2
+ if ls ${etcd}${lev}.d/${oldstartstop}*${bn} >/dev/null 2>&1; then
+ oldnn=`basename ${etcd}${lev}.d/${oldstartstop}*${bn}|cut -c2-3`
+ newnn=$[100-$oldnn]
+ [ $verbose -eq 1 ] && echo "rename
${etcd}${lev}.d/${oldstartstop}${oldnn}${bn} -> ${etcd}${lev}.d/${newstartstop}${newnn}${bn}"
+ if [ $notreally -eq 0 ];then
+ mv ${etcd}${lev}.d/${oldstartstop}${oldnn}${bn}
${etcd}${lev}.d/${newstartstop}${newnn}${bn}
+ fi
+ if [ $dostart -eq 1 ] && [ $newstartstop = "S" ] && [ $lev =
$RUNLEVEL ]; then
+ $fn start || true
+ fi
+ fi
+
+}
+
+renamelinks()
+{
+ if [ $# -eq 2 ]; then
+ renamelink $1 $2
+ else
+ for i in 2 3 4 5 S; do
+ renamelink $1 $i
+ done
+ fi
+}
+
while [ $# -gt 0 ]; do
case $1 in
-n) notreally=1
@@ -221,6 +259,13 @@ case $1 in
;;
start | stop)
+ if [ $# -lt 4 ]
+ then
+ echo "Not enough arguments"
+ usage
+ exit 1
+ fi
+
while [ $# -gt 0 ]; do
if [ $1 = "start" ]; then
letter=S
@@ -251,6 +296,31 @@ case $1 in
makelinks
;;
+ enable | disable)
+ if [ $1 = "enable" ]; then
+ letter=S
+ elif [ $1 = "disable" ]; then
+ letter=K
+ else
+ usage
+ exit 1
+ fi
+ shift
+ if [ $# -gt 0 ]
+ then
+ case $1 in
+ S|2|3|4|5)
+ renamelinks $letter $1
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+ else
+ renamelinks $letter
+ fi
+ ;;
*)
usage
exit 1
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH][meta-virtualization] docker-distribution: fix do package qa warning
On 09/30/2018 01:12 AM, Bruce Ashfield wrote:
These are all to the wrong mailing list, please resend them
to the meta-virtualization list.
OK.
On 2018-09-29 5:26 AM, changqing...@windriver.com wrote:
From: Changqing Li
fix below warning:
1.do_package_qa: QA Issue: No GNU_HASH in the elf binary:
xxx/usr/sbin/registry' [ldflags]
2.do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/registry'
has relocations in .text [textrel]
These need to be 2 separate patches on the resend.
Bruce
Got it.
//Sandy
Add GOBUILDFLAGS which have -buildmode=pie to fix the second problem
Signed-off-by: Changqing Li
---
.../docker-distribution/docker-distribution_git.bb | 3 +-
.../files/0001-fix-do_package_qa-error.patch | 32
++
2 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644
recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch
diff --git
a/recipes-containers/docker-distribution/docker-distribution_git.bb
b/recipes-containers/docker-distribution/docker-distribution_git.bb
index add5ce1..23d94c9 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
SRCREV_distribution="48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"
SRC_URI =
"git://github.com/docker/distribution.git;branch=release/2.6;name=distribution;destsuffix=git/src/github.com/docker/distribution
\
file://docker-registry.service \
+ file://0001-fix-do_package_qa-error.patch \
"
PACKAGES =+ "docker-registry"
@@ -57,7 +58,7 @@ do_install() {
}
INSANE_SKIP_${PN} += "ldflags already-stripped"
-INSANE_SKIP_docker-registry += "ldflags already-stripped"
+INSANE_SKIP_${MLPREFIX}docker-registry += "ldflags already-stripped"
FILES_docker-registry = "${sbindir}/*"
FILES_docker-registry +=
"${systemd_unitdir}/system/docker-registry.service"
diff --git
a/recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch
b/recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch
new file mode 100644
index 000..269b0cd
--- /dev/null
+++
b/recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch
@@ -0,0 +1,32 @@
+From 4b9d701fabff8e7969db081406d00fa9fe46b3fd Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Thu, 27 Sep 2018 11:05:51 +0800
+Subject: [PATCH] fix do_package_qa error
+
+fix below error:
+do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/registry'
+has relocations in .text [textrel]
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 47b8f1d..13b0f92 100644
+--- a/Makefile
b/Makefile
+@@ -39,7 +39,7 @@ GODEP=$(shell which godep || echo '')
+
+ ${PREFIX}/bin/registry: $(GOFILES)
+ @echo "+ $@"
+- @go build -tags "${DOCKER_BUILDTAGS}" -o $@ ${GO_LDFLAGS}
${GO_GCFLAGS} ./cmd/registry
++ @go build -tags "${DOCKER_BUILDTAGS}" -o $@ ${GO_LDFLAGS}
${GOBUILDFLAGS} ${GO_GCFLAGS} ./cmd/registry
+
+ ${PREFIX}/bin/digest: $(GOFILES)
+ @echo "+ $@"
+--
+2.7.4
+
--
BRs
Sandy(Li Changqing)
Wind River Linux
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH][meta-dpdk] dpdk-dev-libibverbs: fix do_fetch error
On 08/28/2018 09:42 AM, Anuj Mittal wrote:
On 08/23/2018 04:40 PM, Changqing Li wrote:
On 08/14/2018 10:27 AM, Anuj Mittal wrote:
On 08/14/2018 09:37 AM, Changqing Li wrote:
On 08/13/2018 02:35 PM, Anuj Mittal wrote:
On 08/13/2018 01:22 PM, changqing...@windriver.com wrote:
From: Changqing Li
original URI have been deleted(don't know why). I noticed there is
an official libibverbs(https://git.kernel.org/pub/scm/libs/infiniband
/libibverbs.git),
The deprecation notice seems to imply that rdma-core on github should be
used instead and that's what debian does too. Perhaps that should be
used instead?
https://tracker.debian.org/pkg/rdma-core
About you mentioned "deprecation notice " , I don't find it on original
github of Mellanox
can you send me a link of this notice? Thanks.
https://git.kernel.org/pub/scm/libs/infiniband/libibverbs.git/commit/?id=1a6ab7f4c4aa048e8cf0c6cbed5935181f660bd8
And, this:
https://www.openfabrics.org/downloads/verbs/README.html
besides, from https://tracker.debian.org/pkg/rdma-core, I can get the
repo is here
https://github.com/linux-rdma/rdma-core, but it is not only
libibverbs, it is source
include some other package, I think it is not proper here.
If you take a look at older version of libibverbs there, you'd see the
code that we had. The later versions are pulling from rdma-core.
You don't need to install everything, just the things that are needed
for dpdk ...
Thanks. I checked oldest
https://github.com/linux-rdma/rdma-core/tree/rdma-core-12/libibverbs,
yes, it is ported from
https://git.kernel.org/pub/scm/libs/infiniband/libibverbs.git.
But my problem is current v19 of rdma-core/libibverbs have big
difference with original tar
libibverbs-1.2.1-3.4-2.0.0.0.tar.gz download from
https://github.com/Mellanox/
dpdk-dev-libibverbs/archive/libibverbs-${PV}.tar.gz, Include code
structure, and compile way(autotool to cmake), and others
Actually, oldest version rdma-core-12 already have code structure, and
compile way change.
I don't have condition to test the function of this lib and dpdk, I can
only go far as build success.
what I worried is upgrade with big difference without test maybe cause
big problem.
if we don't want to use tar on
"https://autobuilder.yocto.io/pub/sources/", I propose who
can test this to upgrade the SRC_URI to rdma-core/libibverbs.
Thank you for checking. Can you please edit the patch to point to yocto
project mirror (downloads.yoctoproject.org/mirror/sources) for now,
include the info that it should be replaced by libibverbs from rdma-core
in commit message and send the patch to meta-intel list?
Thanks,
Anuj
OK, I will resend as you mentioned. Thanks.
Sandy
--
BRs
Sandy(Li Changqing)
Wind River Linux
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH][meta-dpdk] dpdk-dev-libibverbs: fix do_fetch error
On 08/14/2018 10:27 AM, Anuj Mittal wrote:
On 08/14/2018 09:37 AM, Changqing Li wrote:
On 08/13/2018 02:35 PM, Anuj Mittal wrote:
On 08/13/2018 01:22 PM, changqing...@windriver.com wrote:
From: Changqing Li
original URI have been deleted(don't know why). I noticed there is
an official libibverbs(https://git.kernel.org/pub/scm/libs/infiniband
/libibverbs.git),
The deprecation notice seems to imply that rdma-core on github should be
used instead and that's what debian does too. Perhaps that should be
used instead?
https://tracker.debian.org/pkg/rdma-core
About you mentioned "deprecation notice " , I don't find it on original
github of Mellanox
can you send me a link of this notice? Thanks.
https://git.kernel.org/pub/scm/libs/infiniband/libibverbs.git/commit/?id=1a6ab7f4c4aa048e8cf0c6cbed5935181f660bd8
And, this:
https://www.openfabrics.org/downloads/verbs/README.html
besides, from https://tracker.debian.org/pkg/rdma-core, I can get the
repo is here
https://github.com/linux-rdma/rdma-core, but it is not only
libibverbs, it is source
include some other package, I think it is not proper here.
If you take a look at older version of libibverbs there, you'd see the
code that we had. The later versions are pulling from rdma-core.
You don't need to install everything, just the things that are needed
for dpdk ...
Thanks. I checked oldest
https://github.com/linux-rdma/rdma-core/tree/rdma-core-12/libibverbs,
yes, it is ported from
https://git.kernel.org/pub/scm/libs/infiniband/libibverbs.git.
But my problem is current v19 of rdma-core/libibverbs have big
difference with original tar
libibverbs-1.2.1-3.4-2.0.0.0.tar.gz download from
https://github.com/Mellanox/
dpdk-dev-libibverbs/archive/libibverbs-${PV}.tar.gz, Include code
structure, and compile way(autotool to cmake), and others
Actually, oldest version rdma-core-12 already have code structure, and
compile way change.
I don't have condition to test the function of this lib and dpdk, I can
only go far as build success.
what I worried is upgrade with big difference without test maybe cause
big problem.
if we don't want to use tar on
"https://autobuilder.yocto.io/pub/sources/;, I propose who
can test this to upgrade the SRC_URI to rdma-core/libibverbs.
--
BRs
Sandy(Li Changqing)
+861084778653
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [linux-yocto] [PATCH] dmm.cfg: Change dm-multipath from built-in kernel module to LKM
It is for: kernel version: yocto-kernel-cahe: linux-yocto-dev master linux-yocto-4.12 yocto-4.12 On 08/23/2018 09:49 AM, changqing...@windriver.com wrote: From: Changqing Li It is better to use LKM for dm-multipath. 1. For multipathd service, it will modprobe dm-multipath before start the daemon. 2. In package multipath, there is a script mpathconf which can config or check configuration of mutltipath, which will use lsmod to check if dm_multipath is loaded. Signed-off-by: Changqing Li --- cgl/cfg/dmm.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgl/cfg/dmm.cfg b/cgl/cfg/dmm.cfg index e8645a2..3613fcc 100644 --- a/cgl/cfg/dmm.cfg +++ b/cgl/cfg/dmm.cfg @@ -1 +1 @@ -CONFIG_DM_MULTIPATH=y +CONFIG_DM_MULTIPATH=m -- BRs Sandy(Li Changqing) +861084778653 -- ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [yocto] [PATCH][meta-dpdk] dpdk-dev-libibverbs: fix do_fetch error
On 08/13/2018 02:35 PM, Anuj Mittal wrote: On 08/13/2018 01:22 PM, changqing...@windriver.com wrote: From: Changqing Li original URI have been deleted(don't know why). I noticed there is an official libibverbs(https://git.kernel.org/pub/scm/libs/infiniband /libibverbs.git), The deprecation notice seems to imply that rdma-core on github should be used instead and that's what debian does too. Perhaps that should be used instead? https://tracker.debian.org/pkg/rdma-core About you mentioned "deprecation notice " , I don't find it on original github of Mellanox can you send me a link of this notice? Thanks. besides, from https://tracker.debian.org/pkg/rdma-core, I can get the repo is here https://github.com/linux-rdma/rdma-core, but it is not only libibverbs, it is source include some other package, I think it is not proper here. //Sandy but there are big differences with original one. I don't have condition to test this now, I can only go as far as builds OK. so I select use tar.gz on yocto to make sure fetch can success and original function not be affected. I also noticed a project seems like Mellanox libibverbs, https://github.com/gpudirect/libibverbs, but it don't have any official release now. Hope in the future, we can switch to the offcial libibverbs, or the new Mellanox libibverbs. but now, we use this yocto tar.gz as a workaround to make it at least work now. -- BRs Sandy(Li Changqing) +861084778653 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH] pacemaker: remove depend on openais
Please ignore this patch.
On 07/25/2018 02:41 PM, changqing...@windriver.com wrote:
From: Changqing Li
corosync 1.x have removed from meta-cgl, and use corosync under
meta-networking.
corosync 2.x can replace corosync 1.x + openais (in meta-cgl),
so remove depend on openais
Signed-off-by: Changqing Li
---
meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
index 9aeb1fb..8726111 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
@@ -11,7 +11,7 @@ HOMEPAGE = "http://www.clusterlabs.org;
LICENSE = "GPLv2+ & LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=19a64afd3a35d044a80579d7aafc30ff"
-DEPENDS = "corosync libxslt openais libxml2 gnutls resource-agents libqb python-native"
+DEPENDS = "corosync libxslt libxml2 gnutls resource-agents libqb python-native"
SRC_URI = "https://github.com/ClusterLabs/${BPN}/archive/Pacemaker-${PV}.zip \
file://0001-pacemaker-fix-xml-config.patch \
--
BRs
Sandy(Li Changqing)
+861084778653
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [linux-yocto] [PATCH] Add scsi device handler
On 07/03/2018 10:16 AM, Bruce Ashfield wrote: What kernel versions is this for ? Bruce kernel version: yocto-kernel-cahe: linux-yocto-dev master linux-yocto-4.12 yocto-4.12 //changqing On 2018-07-02 1:34 AM, Changqing Li wrote: multipathd service depend on kernel module scsi_dh_alua/ scsi_dh_emc/scsi_dh_rdac, without these kernel modules, service start info will have FAIL info. add these device handler so that user can use it. Signed-off-by: Changqing Li --- cgl/cfg/scsi_dh.cfg | 1 + cgl/cfg/scsi_dh.scc | 6 ++ cgl/cfg/scsi_dh_alua.cfg | 1 + cgl/cfg/scsi_dh_alua.scc | 5 + cgl/cfg/scsi_dh_emc.cfg | 1 + cgl/cfg/scsi_dh_emc.scc | 4 cgl/cfg/scsi_dh_hpsw.cfg | 1 + cgl/cfg/scsi_dh_hpsw.scc | 4 cgl/cfg/scsi_dh_rdac.cfg | 1 + cgl/cfg/scsi_dh_rdac.scc | 5 + 10 files changed, 29 insertions(+) create mode 100644 cgl/cfg/scsi_dh.cfg create mode 100644 cgl/cfg/scsi_dh.scc create mode 100644 cgl/cfg/scsi_dh_alua.cfg create mode 100644 cgl/cfg/scsi_dh_alua.scc create mode 100644 cgl/cfg/scsi_dh_emc.cfg create mode 100644 cgl/cfg/scsi_dh_emc.scc create mode 100644 cgl/cfg/scsi_dh_hpsw.cfg create mode 100644 cgl/cfg/scsi_dh_hpsw.scc create mode 100644 cgl/cfg/scsi_dh_rdac.cfg create mode 100644 cgl/cfg/scsi_dh_rdac.scc diff --git a/cgl/cfg/scsi_dh.cfg b/cgl/cfg/scsi_dh.cfg new file mode 100644 index 000..b73df00 --- /dev/null +++ b/cgl/cfg/scsi_dh.cfg @@ -0,0 +1 @@ +CONFIG_SCSI_DH=y diff --git a/cgl/cfg/scsi_dh.scc b/cgl/cfg/scsi_dh.scc new file mode 100644 index 000..c752aad --- /dev/null +++ b/cgl/cfg/scsi_dh.scc @@ -0,0 +1,6 @@ +define KFEATURE_DESCRIPTION "SCSI Device Handlers" +define KFEATURE_COMPATIBILITY all + +include features/scsi/scsi.scc + +kconf non-hardware scsi_dh.cfg diff --git a/cgl/cfg/scsi_dh_alua.cfg b/cgl/cfg/scsi_dh_alua.cfg new file mode 100644 index 000..7e6ab0d --- /dev/null +++ b/cgl/cfg/scsi_dh_alua.cfg @@ -0,0 +1 @@ +CONFIG_SCSI_DH_ALUA=m diff --git a/cgl/cfg/scsi_dh_alua.scc b/cgl/cfg/scsi_dh_alua.scc new file mode 100644 index 000..2195f13 --- /dev/null +++ b/cgl/cfg/scsi_dh_alua.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "SPC-3 ALUA Device Handler" +define KFEATURE_COMPATIBILITY all + + +kconf non-hardware scsi_dh_alua.cfg diff --git a/cgl/cfg/scsi_dh_emc.cfg b/cgl/cfg/scsi_dh_emc.cfg new file mode 100644 index 000..019c88a --- /dev/null +++ b/cgl/cfg/scsi_dh_emc.cfg @@ -0,0 +1 @@ +CONFIG_SCSI_DH_EMC=m diff --git a/cgl/cfg/scsi_dh_emc.scc b/cgl/cfg/scsi_dh_emc.scc new file mode 100644 index 000..2c22e0f --- /dev/null +++ b/cgl/cfg/scsi_dh_emc.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "EMC CLARiiON Device Handler" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware scsi_dh_emc.cfg diff --git a/cgl/cfg/scsi_dh_hpsw.cfg b/cgl/cfg/scsi_dh_hpsw.cfg new file mode 100644 index 000..2663d05 --- /dev/null +++ b/cgl/cfg/scsi_dh_hpsw.cfg @@ -0,0 +1 @@ +CONFIG_SCSI_DH_HP_SW=m diff --git a/cgl/cfg/scsi_dh_hpsw.scc b/cgl/cfg/scsi_dh_hpsw.scc new file mode 100644 index 000..4cefede --- /dev/null +++ b/cgl/cfg/scsi_dh_hpsw.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "HP/COMPAQ MSA Device Handler" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware scsi_dh_hpsw.cfg diff --git a/cgl/cfg/scsi_dh_rdac.cfg b/cgl/cfg/scsi_dh_rdac.cfg new file mode 100644 index 000..ceafc09 --- /dev/null +++ b/cgl/cfg/scsi_dh_rdac.cfg @@ -0,0 +1 @@ +CONFIG_SCSI_DH_RDAC=m diff --git a/cgl/cfg/scsi_dh_rdac.scc b/cgl/cfg/scsi_dh_rdac.scc new file mode 100644 index 000..ec776be --- /dev/null +++ b/cgl/cfg/scsi_dh_rdac.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "LSI RDAC Device Handler" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware scsi_dh_rdac.cfg + -- BRs Sandy(Li Changqing) +861084778653 -- ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
[yocto] [PATCH] samhain: correct service status
status get by "systemctl status samhain" is not correct. It is active(exited) now. but actually, there is a dameon running, it should be active(running). so change Type of servive. Signed-off-by: Changqing Li --- recipes-security/samhain/files/samhain.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-security/samhain/files/samhain.service b/recipes-security/samhain/files/samhain.service index e6dc3b9..e4f216a 100644 --- a/recipes-security/samhain/files/samhain.service +++ b/recipes-security/samhain/files/samhain.service @@ -3,7 +3,7 @@ Description=Samhain @MODE_NAME@ Daemon After=syslog.target network.target [Service] -Type=oneshot +Type=forking RemainAfterExit=yes ExecStart=@LIBDIR@/@SAMHAIN_HELPER@ start ExecStop=@LIBDIR@/@SAMHAIN_HELPER@ stop -- 2.7.4 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][meta-cloud-services] spice: remove spice receipe from meta-cloud-services
spice have been export to meta-openembedded/meta-networking,
and have newer version. spice under this layer now have
compile error, but spice under networking layer don't.
Maybe we should not maintain 2 same spices, so delete it.
Signed-off-by: Changqing Li
---
...ros-in-printf-to-keep-compatibility-betwe.patch | 72 ---
...xl-Fix-BITMAP_FMT_IS_RGB-defined-but-not-.patch | 29 --
recipes-support/spice/files/CVE-2017-7506-1.patch | 81 -
recipes-support/spice/files/CVE-2017-7506-2.patch | 37
recipes-support/spice/files/CVE-2017-7506-3.patch | 54 ---
.../spice/files/Fix-build-issues-with-gcc-7.patch | 59
.../build-allow-separated-src-and-build-dirs.patch | 62 -
...ac-add-subdir-objects-to-AM_INIT_AUTOMAKE.patch | 29 --
.../spice/files/spice-fix-CVE-2013-4282.patch | 100 -
recipes-support/spice/spice_git.bb | 79
10 files changed, 602 deletions(-)
delete mode 100644
recipes-support/spice/files/0001-Use-PRI-macros-in-printf-to-keep-compatibility-betwe.patch
delete mode 100644
recipes-support/spice/files/0001-red_parse_qxl-Fix-BITMAP_FMT_IS_RGB-defined-but-not-.patch
delete mode 100644 recipes-support/spice/files/CVE-2017-7506-1.patch
delete mode 100644 recipes-support/spice/files/CVE-2017-7506-2.patch
delete mode 100644 recipes-support/spice/files/CVE-2017-7506-3.patch
delete mode 100644
recipes-support/spice/files/Fix-build-issues-with-gcc-7.patch
delete mode 100644
recipes-support/spice/files/build-allow-separated-src-and-build-dirs.patch
delete mode 100644
recipes-support/spice/files/configure.ac-add-subdir-objects-to-AM_INIT_AUTOMAKE.patch
delete mode 100644 recipes-support/spice/files/spice-fix-CVE-2013-4282.patch
delete mode 100644 recipes-support/spice/spice_git.bb
diff --git
a/recipes-support/spice/files/0001-Use-PRI-macros-in-printf-to-keep-compatibility-betwe.patch
b/recipes-support/spice/files/0001-Use-PRI-macros-in-printf-to-keep-compatibility-betwe.patch
deleted file mode 100644
index 18fa8fa..000
---
a/recipes-support/spice/files/0001-Use-PRI-macros-in-printf-to-keep-compatibility-betwe.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3cb746329ea4846bd9c65e0198e69423379b6f62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=EC=86=8C=EB=B3=91=EC=B2=A0?=
-Date: Thu, 24 Apr 2014 12:26:32 +
-Subject: [PATCH] Use PRI macros in printf to keep compatibility between
- 32/64bit system
-
-gcc's some integer type definitions are different between 32/64bit system.
-This causes platform dependency problem with printf function. However,
-we can avoid this problem by using PRI macros that supports platform
-independent printf.
- server/mjpeg_encoder.c | 7 ---
- server/red_worker.c| 4 ++--
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c
-index aea4964..f465d88 100644
a/server/mjpeg_encoder.c
-+++ b/server/mjpeg_encoder.c
-@@ -23,6 +23,7 @@
- #include "mjpeg_encoder.h"
- #include
- #include
-+#include
-
- #define MJPEG_MAX_FPS 25
- #define MJPEG_MIN_FPS 1
-@@ -66,7 +67,7 @@ static const int
mjpeg_quality_samples[MJPEG_QUALITY_SAMPLE_NUM] = {20, 30, 40,
- * are not necessarily related to mis-estimation of the bit rate, and we would
- * like to wait till the stream stabilizes.
- */
--#define MJPEG_WARMUP_TIME 3000L // 3 sec
-+#define MJPEG_WARMUP_TIME 3000LL // 3 sec
-
- enum {
- MJPEG_QUALITY_EVAL_TYPE_SET,
-@@ -638,7 +639,7 @@ static void
mjpeg_encoder_adjust_params_to_bit_rate(MJpegEncoder *encoder)
-
- spice_debug("cur-fps=%u new-fps=%u (new/old=%.2f) |"
- "bit-rate=%.2f (Mbps) latency=%u (ms) quality=%d |"
--" new-size-avg %lu , base-size %lu, (new/old=%.2f) ",
-+" new-size-avg %"PRIu64" , base-size %"PRIu64",
(new/old=%.2f) ",
- rate_control->fps, new_fps,
((double)new_fps)/rate_control->fps,
- ((double)rate_control->byte_rate*8)/1024/1024,
- latency,
-@@ -703,7 +704,7 @@ static void mjpeg_encoder_adjust_fps(MJpegEncoder
*encoder, uint64_t now)
-
- avg_fps = ((double)rate_control->adjusted_fps_num_frames*1000) /
- adjusted_fps_time_passed;
--spice_debug("#frames-adjust=%lu #adjust-time=%lu avg-fps=%.2f",
-+spice_debug("#frames-adjust=%"PRIu64" #adjust-time=%"PRIu64"
avg-fps=%.2f",
- rate_control->adjusted_fps_num_frames,
adjusted_fps_time_passed, avg_fps);
- spice_debug("defined=%u old-adjusted=%.2f", rate_control->fps,
rate_control->adjusted_fps);
- fps_ratio = avg_fps / rate_control->fps;
-diff --git a/server/red_worker.c b/server/red_worker.c
-index 619f7bc..1871e13 100644
a/server/
