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/lib/oeqa/manual/abat.patch | |
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/lib/oeqa/manual/abat.patch')
-rw-r--r-- | poky/meta/lib/oeqa/manual/abat.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/poky/meta/lib/oeqa/manual/abat.patch b/poky/meta/lib/oeqa/manual/abat.patch new file mode 100644 index 0000000000..1541ac80cb --- /dev/null +++ b/poky/meta/lib/oeqa/manual/abat.patch @@ -0,0 +1,64 @@ +######## +diff --git a/glxgears_check.sh b/glxgears_check.sh +index 17622b8..c4d3b97 100755 +--- a/glxgears_check.sh ++++ b/glxgears_check.sh +@@ -31,7 +31,7 @@ else + + sleep 6 + +- XPID=$( ps ax | awk '{print $1, $5}' | grep glxgears | awk '{print $1}') ++ XPID=$( ps | awk '{print $1, $5}' | grep glxgears | awk '{print $1}') + if [ ! -z "$XPID" ]; then + kill -9 $XPID >/dev/null 2>&1 + echo "glxgears can run, PASS!" +diff --git a/x_close.sh b/x_close.sh +index e287be1..3429f1a 100755 +--- a/x_close.sh ++++ b/x_close.sh +@@ -22,7 +22,7 @@ + # + function close_proc(){ + echo "kill process Xorg" +-XPID=$( ps ax | awk '{print $1, $5}' | egrep "X$|Xorg$" | awk '{print $1}') ++XPID=$( ps | awk '{print $1, $6}' | egrep "X$|Xorg$" | awk '{print $1}') + if [ ! -z "$XPID" ]; then + kill $XPID + sleep 4 +diff --git a/x_start.sh b/x_start.sh +index 9cf6eab..2305796 100755 +--- a/x_start.sh ++++ b/x_start.sh +@@ -24,7 +24,7 @@ + X_ERROR=0 + + #test whether X has started +-PXID=$(ps ax |awk '{print $1,$5}' |egrep "Xorg$|X$" |grep -v grep | awk '{print $1}') ++PXID=$(ps |awk '{print $1,$6}' |egrep "Xorg$|X$" |grep -v grep | awk '{print $1}') + if [ ! -z "$PXID" ]; then + echo "[WARNING] Xorg has started!" + XORG_STATUS="started" +@@ -35,9 +35,11 @@ else + #start up the x server + echo "Start up the X server for test in display $DISPLAY................" + +- $XORG_DIR/bin/X >/dev/null 2>&1 & ++ #$XORG_DIR/bin/X >/dev/null 2>&1 & ++ #sleep 8 ++ #xterm & ++ /etc/init.d/xserver-nodm start & + sleep 8 +- xterm & + fi + XLOG_FILE=/var/log/Xorg.0.log + [ -f $XORG_DIR/var/log/Xorg.0.log ] && XLOG_FILE=$XORG_DIR/var/log/Xorg.0.log +@@ -54,7 +56,7 @@ fi + X_ERROR=1 + fi + +- XPID=$( ps ax | awk '{print $1, $5}' | egrep "X$|Xorg$" |grep -v grep| awk '{print $1}') ++ XPID=$( ps | awk '{print $1, $6}' | egrep "X$|Xorg$" |grep -v grep| awk '{print $1}') + if [ -z "$XPID" ]; then + echo "Start up X server FAIL!" + echo +########
\ No newline at end of file |