F23 4.3 rebase plan
by Josh Boyer
Hi All,
Really no different from any of the last major version rebases we've
done. We'll likely rebase F23 to the 4.3.y kernel around the time
4.3.1 or 4.3.2 is released upstream. Until then, the stabilization
branch is tracking what should eventually be merged into F23.
F22 will follow sometime thereafter. F21 will not be rebased to 4.2
or 4.3 and will go EOL with 4.1.13. Please migrate off of F21 as soon
as possible.
If you have questions, please let us know.
josh
7 years, 11 months
Building dell_rbu module
by Major Hayden
Hey folks,
I've rebuilt quite a few Fedora kernels to enable the dell_rbu module for firmware updates on various Dell servers, workstations, and laptops that are running Fedora 21 and 22. Would it be possible to have it enabled in the normal kernel builds?
I found a bugzilla ticket[1] referenced in the kernel config[2] that points to some installation issues in Fedora 20. I can't tell if the bug was within dell_rbu or perhaps in systemd-udevd from the ticket. However, I've had success loading the module on various Dell equipment over the last 18 months or so.
If we enable it, could we ensure that it's not enabled by default? I wondered if a kernel subpackage would be helpful but that seems a bit like overkill.
Thanks!
[1] https://bugzilla.redhat.com/show_bug.cgi?id=997149
[2] http://pkgs.fedoraproject.org/cgit/kernel.git/tree/config-x86-generic?h=f22
--
Major Hayden
7 years, 11 months
kernel-tests master: Remove extra parentheses (c4984e6)
by Justin Forbes
Repository : http://git.fedorahosted.org/cgit/kernel-tests.git
On branch : master
>---------------------------------------------------------------
commit c4984e62112487bcf9013734d44063c4d0905d5c
Author: Craig Rodrigues <rodrigc(a)FreeBSD.org>
Date: Mon Dec 21 13:26:28 2015 -0800
Remove extra parentheses
>---------------------------------------------------------------
.../libhugetlbfs/huge_page_setup_helper.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py b/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py
index e41fbfc..d4a2f3e 100755
--- a/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py
+++ b/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py
@@ -262,7 +262,7 @@ if debug == False:
try:
sysctlConfLines = open(sysctlConf).readlines()
os.rename(sysctlConf, sysctlConf + ".backup")
- print(("Saved original %s as %s.backup" % (sysctlConf, sysctlConf)))
+ print("Saved original %s as %s.backup" % (sysctlConf, sysctlConf))
except:
pass
@@ -297,7 +297,7 @@ if debug == False:
try:
limitsConfLines = open(limitsConf).readlines()
os.rename(limitsConf, limitsConf + ".backup")
- print(("Saved original %s as %s.backup" % (limitsConf, limitsConf)))
+ print("Saved original %s as %s.backup" % (limitsConf, limitsConf))
except:
pass
7 years, 11 months
kernel-tests master: Use input() instead of raw_input(). [PEP 3111] (b728667)
by Justin Forbes
Repository : http://git.fedorahosted.org/cgit/kernel-tests.git
On branch : master
>---------------------------------------------------------------
commit b7286674f06b9d75a0e745b10dd0637c54137cae
Author: Craig Rodrigues <rodrigc(a)FreeBSD.org>
Date: Sat Nov 14 17:05:31 2015 -0800
Use input() instead of raw_input(). [PEP 3111]
raw_input() was renamed to input() in Python 3, and raw_input() was removed.
For Python 2, apply a workaround so that we still execute the raw_input()
function, since it behaves differently from input().
See:
https://www.python.org/dev/peps/pep-3111/
>---------------------------------------------------------------
.../libhugetlbfs/huge_page_setup_helper.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py b/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py
index 67ea91c..e41fbfc 100755
--- a/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py
+++ b/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py
@@ -95,12 +95,14 @@ print(" * Remaining System Memory..: %6d MB" % (memTotal - (hugePages * hugePage
print(" * Huge Page User Group.....: %s (%d)" % (hugeGIDName, hugeGID))
print()
+if sys.version_info < (3,):
+ input = raw_input
# ask how memory they want to allocate for huge pages
userIn = None
while not userIn:
try:
- userIn = raw_input("How much memory would you like to allocate for huge pages? "
+ userIn = input("How much memory would you like to allocate for huge pages? "
"(input in MB, unless postfixed with GB): ")
if userIn[-2:] == "GB":
userHugePageReqMB = int(userIn[0:-2]) * 1024
@@ -136,7 +138,7 @@ inputIsValid = False
# ask for the name of the group allowed access to huge pages
while inputIsValid == False:
foundbad = False
- userGroupReq = raw_input("What group should have access to the huge pages?"
+ userGroupReq = input("What group should have access to the huge pages?"
"(The group will be created, if need be) [hugepages]: ")
if userGroupReq is '':
userGroupReq = 'hugepages'
@@ -188,7 +190,7 @@ inputIsValid = False
# ask for user(s) that should be in the huge page access group
while inputIsValid == False:
foundbad = False
- userUsersReq = raw_input("What user(s) should have access to the huge pages (space-delimited list, users created as needed)? ")
+ userUsersReq = input("What user(s) should have access to the huge pages (space-delimited list, users created as needed)? ")
for char in badchars:
if char in userUsersReq:
foundbad = True
7 years, 11 months
kernel-tests master: Fix exception handling syntax. [PEP-3110] (e49d387)
by Justin Forbes
Repository : http://git.fedorahosted.org/cgit/kernel-tests.git
On branch : master
>---------------------------------------------------------------
commit e49d387fb1e905d5f102452d968ae79d5adef3bf
Author: Craig Rodrigues <rodrigc(a)FreeBSD.org>
Date: Sat Nov 14 16:52:46 2015 -0800
Fix exception handling syntax. [PEP-3110]
Use new exception handling syntax as specified here:
https://www.python.org/dev/peps/pep-3110/
>---------------------------------------------------------------
.../libhugetlbfs/libhugetlbfs/tests/run_tests.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py b/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py
index e84e29d..56bf5c0 100755
--- a/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py
+++ b/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py
@@ -656,7 +656,7 @@ def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "vVfdt:b:p:c")
- except getopt.GetoptError, err:
+ except getopt.GetoptError as err:
print(str(err))
sys.exit(1)
for opt, arg in opts:
7 years, 11 months
kernel-tests master: Use repr() instead of backticks. [PEP 3099] (ee59e49)
by Justin Forbes
Repository : http://git.fedorahosted.org/cgit/kernel-tests.git
On branch : master
>---------------------------------------------------------------
commit ee59e49c39aaa8e861532855e126fa447c713820
Author: Craig Rodrigues <rodrigc(a)FreeBSD.org>
Date: Sat Nov 14 16:47:45 2015 -0800
Use repr() instead of backticks. [PEP 3099]
Backticks were removed as an alias for repr() in Python 3.
See: https://www.python.org/dev/peps/pep-3099/
>---------------------------------------------------------------
.../libhugetlbfs/libhugetlbfs/tests/run_tests.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py b/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py
index dc676b6..e84e29d 100755
--- a/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py
+++ b/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py
@@ -216,7 +216,7 @@ def clear_hpages():
cleaned up automatically and must be removed to free up the huge pages.
"""
for mount in mounts:
- dir = mount + "/elflink-uid-" + `os.getuid()`
+ dir = mount + "/elflink-uid-" + repr(os.getuid())
for root, dirs, files in os.walk(dir, topdown=False):
for name in files:
os.remove(os.path.join(root, name))
@@ -459,7 +459,7 @@ def setup_shm_sysctl(limit):
sysctls[f] = fh.read()
fh.close()
fh = open(f, "w")
- fh.write(`limit`)
+ fh.write(repr(limit))
fh.close()
print("set shmmax limit to %s" % limit)
return sysctls
7 years, 11 months
kernel-tests master: Use print() as a function for Python 3. [PEP 3105] (655fa33)
by Justin Forbes
Repository : http://git.fedorahosted.org/cgit/kernel-tests.git
On branch : master
>---------------------------------------------------------------
commit 655fa33fde96e57153e1664ee53753cf17c70300
Author: Craig Rodrigues <rodrigc(a)FreeBSD.org>
Date: Sat Nov 14 16:43:44 2015 -0800
Use print() as a function for Python 3. [PEP 3105]
import __future__.print_function to keep things working on Python 2.
>---------------------------------------------------------------
.../libhugetlbfs/huge_page_setup_helper.py | 122 ++++++++++----------
.../libhugetlbfs/libhugetlbfs/tests/run_tests.py | 60 +++++-----
fedora_submit.py | 9 +-
3 files changed, 98 insertions(+), 93 deletions(-)
diff --git a/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py b/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py
index 8bfef14..67ea91c 100755
--- a/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py
+++ b/default/libhugetlbfs/libhugetlbfs/huge_page_setup_helper.py
@@ -8,19 +8,21 @@
#
# Requires hugeadm from libhugetlbfs 2.7 (or backported support)
#
+from __future__ import print_function
+
import os
debug = False
# must be executed under the root to operate
if os.geteuid() != 0:
- print "You must be root to setup hugepages!"
+ print("You must be root to setup hugepages!")
os._exit(1)
# config files we need access to
sysctlConf = "/etc/sysctl.conf"
if not os.access(sysctlConf, os.W_OK):
- print "Cannot access %s" % sysctlConf
+ print("Cannot access %s" % sysctlConf)
if debug == False:
os._exit(1)
@@ -41,7 +43,7 @@ for line in hugeadmexplain:
break
if memTotal == 0:
- print "Your version of libhugetlbfs' hugeadm utility is too old!"
+ print("Your version of libhugetlbfs' hugeadm utility is too old!")
os._exit(1)
@@ -54,7 +56,7 @@ for line in poolList:
break
if hugePageSize == 0:
- print "Aborting, cannot determine system huge page size!"
+ print("Aborting, cannot determine system huge page size!")
os._exit(1)
# Get initial sysctl settings
@@ -83,15 +85,15 @@ for line in groupNames:
# dump system config as we see it before we start tweaking it
-print "Current configuration:"
-print " * Total System Memory......: %6d MB" % memTotal
-print " * Shared Mem Max Mapping...: %6d MB" % (shmmax / (1024 * 1024))
-print " * System Huge Page Size....: %6d MB" % (hugePageSize / (1024 * 1024))
-print " * Number of Huge Pages.....: %6d" % hugePages
-print " * Total size of Huge Pages.: %6d MB" % (hugePages * hugePageSize / (1024 * 1024))
-print " * Remaining System Memory..: %6d MB" % (memTotal - (hugePages * hugePageSize / (1024 * 1024)))
-print " * Huge Page User Group.....: %s (%d)" % (hugeGIDName, hugeGID)
-print
+print("Current configuration:")
+print(" * Total System Memory......: %6d MB" % memTotal)
+print(" * Shared Mem Max Mapping...: %6d MB" % (shmmax / (1024 * 1024)))
+print(" * System Huge Page Size....: %6d MB" % (hugePageSize / (1024 * 1024)))
+print(" * Number of Huge Pages.....: %6d" % hugePages)
+print(" * Total size of Huge Pages.: %6d MB" % (hugePages * hugePageSize / (1024 * 1024)))
+print(" * Remaining System Memory..: %6d MB" % (memTotal - (hugePages * hugePageSize / (1024 * 1024))))
+print(" * Huge Page User Group.....: %s (%d)" % (hugeGIDName, hugeGID))
+print()
# ask how memory they want to allocate for huge pages
@@ -113,19 +115,19 @@ while not userIn:
# As a sanity safeguard, require at least 128M not be allocated to huge pages
if userHugePageReqMB > (memTotal - 128):
userIn = None
- print "Refusing to allocate %d, you must leave at least 128MB for the system" % userHugePageReqMB
+ print("Refusing to allocate %d, you must leave at least 128MB for the system" % userHugePageReqMB)
elif userHugePageReqMB < (hugePageSize / (1024 * 1024)):
userIn = None
- print "Sorry, allocation must be at least a page's worth!"
+ print("Sorry, allocation must be at least a page's worth!")
else:
break
except ValueError:
userIn = None
- print "Input must be an integer, please try again!"
+ print("Input must be an integer, please try again!")
userHugePageReqKB = userHugePageReqMB * 1024
userHugePagesReq = userHugePageReqKB / (hugePageSize / 1024)
-print "Okay, we'll try to allocate %d MB for huge pages..." % userHugePageReqMB
-print
+print("Okay, we'll try to allocate %d MB for huge pages..." % userHugePageReqMB)
+print()
# some basic user input validation
@@ -140,18 +142,18 @@ while inputIsValid == False:
userGroupReq = 'hugepages'
if userGroupReq[0].isdigit() or userGroupReq[0] == "-":
foundbad = True
- print "Group names cannot start with a number or dash, please try again!"
+ print("Group names cannot start with a number or dash, please try again!")
for char in badchars:
if char in userGroupReq:
foundbad = True
- print "Illegal characters in group name, please try again!"
+ print("Illegal characters in group name, please try again!")
break
if len(userGroupReq) > 16:
foundbad = True
- print "Group names can't be more than 16 characaters, please try again!"
+ print("Group names can't be more than 16 characaters, please try again!")
if foundbad == False:
inputIsValid = True
-print "Okay, we'll give group %s access to the huge pages" % userGroupReq
+print("Okay, we'll give group %s access to the huge pages" % userGroupReq)
# see if group already exists, use it if it does, if not, create it
@@ -163,20 +165,20 @@ for line in groupNames:
break
if userGIDReq > -1:
- print "Group %s (gid %d) already exists, we'll use it" % (userGroupReq, userGIDReq)
+ print("Group %s (gid %d) already exists, we'll use it" % (userGroupReq, userGIDReq))
else:
if debug == False:
os.popen("/usr/sbin/groupadd %s" % userGroupReq)
else:
- print "/usr/sbin/groupadd %s" % userGroupReq
+ print("/usr/sbin/groupadd %s" % userGroupReq)
groupNames = os.popen("/usr/bin/getent group %s" % userGroupReq).readlines()
for line in groupNames:
curGroupName = line.split(":")[0]
if curGroupName == userGroupReq:
userGIDReq = int(line.split(":")[2])
break
- print "Created group %s (gid %d) for huge page use" % (userGroupReq, userGIDReq)
-print
+ print("Created group %s (gid %d) for huge page use" % (userGroupReq, userGIDReq))
+print()
# basic user input validation, take 2
@@ -190,16 +192,16 @@ while inputIsValid == False:
for char in badchars:
if char in userUsersReq:
foundbad = True
- print "Illegal characters in user name(s) or invalid list format, please try again!"
+ print("Illegal characters in user name(s) or invalid list format, please try again!")
break
for n in userUsersReq.split():
if len(n) > 32:
foundbad = True
- print "User names can't be more than 32 characaters, please try again!"
+ print("User names can't be more than 32 characaters, please try again!")
break
if n[0] == "-":
foundbad = True
- print "User names cannot start with a dash, please try again!"
+ print("User names cannot start with a dash, please try again!")
break
if foundbad == False:
inputIsValid = True
@@ -211,24 +213,24 @@ for hugeUser in hugePageUserList:
for line in curUserList:
curUser = line.split(":")[0]
if curUser == hugeUser:
- print "Adding user %s to huge page group" % hugeUser
+ print("Adding user %s to huge page group" % hugeUser)
userExists = True
if debug == False:
os.popen("/usr/sbin/usermod -a -G %s %s" % (userGroupReq, hugeUser))
else:
- print "/usr/sbin/usermod -a -G %s %s" % (userGroupReq, hugeUser)
+ print("/usr/sbin/usermod -a -G %s %s" % (userGroupReq, hugeUser))
if userExists == True:
break
if userExists == False:
- print "Creating user %s with membership in huge page group" % hugeUser
+ print("Creating user %s with membership in huge page group" % hugeUser)
if debug == False:
if hugeUser == userGroupReq:
os.popen("/usr/sbin/useradd %s -g %s" % (hugeUser, userGroupReq))
else:
os.popen("/usr/sbin/useradd %s -G %s" % (hugeUser, userGroupReq))
else:
- print "/usr/sbin/useradd %s -G %s" % (hugeUser, userGroupReq)
-print
+ print("/usr/sbin/useradd %s -G %s" % (hugeUser, userGroupReq))
+print()
# set values for the current running environment
@@ -238,11 +240,11 @@ if debug == False:
os.popen("/usr/bin/hugeadm --set-shm-group %d" % userGIDReq)
os.popen("/usr/bin/hugeadm --set-recommended-shmmax")
else:
- print "/usr/bin/hugeadm --pool-pages-min DEFAULT:%sM" % userHugePageReqMB
- print "/usr/bin/hugeadm --pool-pages-max DEFAULT:%sM" % userHugePageReqMB
- print "/usr/bin/hugeadm --set-shm-group %d" % userGIDReq
- print "/usr/bin/hugeadm --set-recommended-shmmax"
- print
+ print("/usr/bin/hugeadm --pool-pages-min DEFAULT:%sM" % userHugePageReqMB)
+ print("/usr/bin/hugeadm --pool-pages-max DEFAULT:%sM" % userHugePageReqMB)
+ print("/usr/bin/hugeadm --set-shm-group %d" % userGIDReq)
+ print("/usr/bin/hugeadm --set-recommended-shmmax")
+ print()
# figure out what that shmmax value we just set was
hugeadmexplain = os.popen("/usr/bin/hugeadm --explain 2>/dev/null").readlines()
@@ -258,7 +260,7 @@ if debug == False:
try:
sysctlConfLines = open(sysctlConf).readlines()
os.rename(sysctlConf, sysctlConf + ".backup")
- print("Saved original %s as %s.backup" % (sysctlConf, sysctlConf))
+ print(("Saved original %s as %s.backup" % (sysctlConf, sysctlConf)))
except:
pass
@@ -279,11 +281,11 @@ if debug == False:
fd.close()
else:
- print "Add to %s:" % sysctlConf
- print "kernel.shmmax = %d" % shmmax
- print "vm.nr_hugepages = %d" % userHugePagesReq
- print "vm.hugetlb_shm_group = %d" % userGIDReq
- print
+ print("Add to %s:" % sysctlConf)
+ print("kernel.shmmax = %d" % shmmax)
+ print("vm.nr_hugepages = %d" % userHugePagesReq)
+ print("vm.hugetlb_shm_group = %d" % userGIDReq)
+ print()
# write out limits.conf changes to persist across reboot
@@ -293,7 +295,7 @@ if debug == False:
try:
limitsConfLines = open(limitsConf).readlines()
os.rename(limitsConf, limitsConf + ".backup")
- print("Saved original %s as %s.backup" % (limitsConf, limitsConf))
+ print(("Saved original %s as %s.backup" % (limitsConf, limitsConf)))
except:
pass
@@ -319,25 +321,25 @@ if debug == False:
fd.close()
else:
- print "Add to %s:" % limitsConf
+ print("Add to %s:" % limitsConf)
for hugeUser in hugePageUserList:
- print "%s soft memlock %d" % (hugeUser, userHugePageReqKB)
- print "%s hard memlock %d" % (hugeUser, userHugePageReqKB)
+ print("%s soft memlock %d" % (hugeUser, userHugePageReqKB))
+ print("%s hard memlock %d" % (hugeUser, userHugePageReqKB))
# dump the final configuration of things now that we're done tweaking
-print
-print "Final configuration:"
-print " * Total System Memory......: %6d MB" % memTotal
+print()
+print("Final configuration:")
+print(" * Total System Memory......: %6d MB" % memTotal)
if debug == False:
- print " * Shared Mem Max Mapping...: %6d MB" % (shmmax / (1024 * 1024))
+ print(" * Shared Mem Max Mapping...: %6d MB" % (shmmax / (1024 * 1024)))
else:
# This should be what we *would* have set it to, had we actually run hugeadm --set-recommended-shmmax
- print " * Shared Mem Max Mapping...: %6d MB" % (userHugePagesReq * hugePageSize / (1024 * 1024))
-print " * System Huge Page Size....: %6d MB" % (hugePageSize / (1024 * 1024))
-print " * Available Huge Pages.....: %6d" % userHugePagesReq
-print " * Total size of Huge Pages.: %6d MB" % (userHugePagesReq * hugePageSize / (1024 * 1024))
-print " * Remaining System Memory..: %6d MB" % (memTotal - userHugePageReqMB)
-print " * Huge Page User Group.....: %s (%d)" % (userGroupReq, userGIDReq)
-print
+ print(" * Shared Mem Max Mapping...: %6d MB" % (userHugePagesReq * hugePageSize / (1024 * 1024)))
+print(" * System Huge Page Size....: %6d MB" % (hugePageSize / (1024 * 1024)))
+print(" * Available Huge Pages.....: %6d" % userHugePagesReq)
+print(" * Total size of Huge Pages.: %6d MB" % (userHugePagesReq * hugePageSize / (1024 * 1024)))
+print(" * Remaining System Memory..: %6d MB" % (memTotal - userHugePageReqMB))
+print(" * Huge Page User Group.....: %s (%d)" % (userGroupReq, userGIDReq))
+print()
diff --git a/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py b/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py
index 8055940..dc676b6 100755
--- a/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py
+++ b/default/libhugetlbfs/libhugetlbfs/tests/run_tests.py
@@ -1,5 +1,7 @@
#! /usr/bin/env python
+from __future__ import print_function
+
import subprocess
import types
import os
@@ -59,7 +61,7 @@ def snapshot_pool_state():
def run_test_prog(bits, pagesize, cmd, **env):
if paranoid_pool_check:
beforepool = snapshot_pool_state()
- print "Pool state: %s" % str(beforepool)
+ print("Pool state: %s" % str(beforepool))
local_env = os.environ.copy()
local_env.update(env)
@@ -82,9 +84,9 @@ def run_test_prog(bits, pagesize, cmd, **env):
if paranoid_pool_check:
afterpool = snapshot_pool_state()
if afterpool != beforepool:
- print >>sys.stderr, "Hugepage pool state not preserved!"
- print >>sys.stderr, "BEFORE: %s" % str(beforepool)
- print >>sys.stderr, "AFTER: %s" % str(afterpool)
+ print("Hugepage pool state not preserved!", file=sys.stderr)
+ print("BEFORE: %s" % str(beforepool), file=sys.stderr)
+ print("AFTER: %s" % str(afterpool), file=sys.stderr)
sys.exit(98)
return (rc, out)
@@ -142,22 +144,22 @@ def print_per_size(title, values):
Print the results of a given result type on one line. The results for all
page sizes and word sizes are written in a table format.
"""
- print "*%20s: " % title,
+ print("*%20s: " % title, end=' ')
for sz in pagesizes:
- print "%4s %4s " % (values[sz][32], values[sz][64]),
- print
+ print("%4s %4s " % (values[sz][32], values[sz][64]), end=' ')
+ print()
def results_summary():
"""
Display a summary of the test results
"""
- print "********** TEST SUMMARY"
- print "*%21s" % "",
- for p in pagesizes: print "%-13s " % pretty_page_size(p),
- print
- print "*%21s" % "",
- for p in pagesizes: print "32-bit 64-bit ",
- print
+ print("********** TEST SUMMARY")
+ print("*%21s" % "", end=' ')
+ for p in pagesizes: print("%-13s " % pretty_page_size(p), end=' ')
+ print()
+ print("*%21s" % "", end=' ')
+ for p in pagesizes: print("32-bit 64-bit ", end=' ')
+ print()
print_per_size("Total testcases", R["total"])
print_per_size("Skipped", R["skip"])
@@ -168,7 +170,7 @@ def results_summary():
print_per_size("Expected FAIL", R["xfail"])
print_per_size("Unexpected PASS", R["xpass"])
print_per_size("Strange test result", R["strange"])
- print "**********"
+ print("**********")
def free_hpages():
"""
@@ -268,13 +270,13 @@ def check_hugetlbfs_path():
okbits.append(b)
mounts.append(out)
if len(okbits) == 0:
- print "run_tests.py: No mountpoints available for page size %s" % \
- pretty_page_size(p)
+ print("run_tests.py: No mountpoints available for page size %s" % \
+ pretty_page_size(p))
wordsizes_by_pagesize[p] = set()
continue
for b in wordsizes - set(okbits):
- print "run_tests.py: The %i bit word size is not compatible with " \
- "%s pages" % (b, pretty_page_size(p))
+ print("run_tests.py: The %i bit word size is not compatible with " \
+ "%s pages" % (b, pretty_page_size(p)))
wordsizes_by_pagesize[p] = set(okbits)
def check_linkhuge_tests():
@@ -296,10 +298,10 @@ def check_linkhuge_tests():
def print_cmd(pagesize, bits, cmd, env):
if env:
- print ' '.join(['%s=%s' % (k, v) for k, v in env.items()]),
+ print(' '.join(['%s=%s' % (k, v) for k, v in env.items()]), end=' ')
if type(cmd) != types.StringType:
cmd = ' '.join(cmd)
- print "%s (%s: %i):\t" % (cmd, pretty_page_size(pagesize), bits),
+ print("%s (%s: %i):\t" % (cmd, pretty_page_size(pagesize), bits), end=' ')
sys.stdout.flush()
def run_test(pagesize, bits, cmd, **env):
@@ -319,7 +321,7 @@ def run_test(pagesize, bits, cmd, **env):
print_cmd(pagesize, bits, cmd, env)
(rc, out) = run_test_prog(bits, pagesize, cmd, **env)
- print out
+ print(out)
R["total"][pagesize][bits] += 1
if rc == 0: R["pass"][pagesize][bits] += 1
@@ -338,7 +340,7 @@ def skip_test(pagesize, bits, cmd, **env):
R["total"][pagesize][bits] += 1
R["skip"][pagesize][bits] += 1
print_cmd(pagesize, bits, cmd, env)
- print "SKIPPED"
+ print("SKIPPED")
def do_test(cmd, bits=None, **env):
"""
@@ -459,7 +461,7 @@ def setup_shm_sysctl(limit):
fh = open(f, "w")
fh.write(`limit`)
fh.close()
- print "set shmmax limit to %s" % limit
+ print("set shmmax limit to %s" % limit)
return sysctls
def restore_shm_sysctl(sysctls):
@@ -655,7 +657,7 @@ def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "vVfdt:b:p:c")
except getopt.GetoptError, err:
- print str(err)
+ print(str(err))
sys.exit(1)
for opt, arg in opts:
if opt == "-v":
@@ -680,8 +682,8 @@ def main():
if len(pagesizes) == 0: pagesizes = get_pagesizes()
if len(pagesizes) == 0:
- print "Unable to find available page sizes, are you sure hugetlbfs"
- print "is mounted and there are available huge pages?"
+ print("Unable to find available page sizes, are you sure hugetlbfs")
+ print("is mounted and there are available huge pages?")
return 1
setup_env(env_override, env_defaults)
@@ -689,8 +691,8 @@ def main():
(rc, system_default_hpage_size) = hpage_size()
if rc != 0:
- print "Unable to find system default hugepage size."
- print "Is hugepage supported included in this kernel?"
+ print("Unable to find system default hugepage size.")
+ print("Is hugepage supported included in this kernel?")
return 1
check_hugetlbfs_path()
diff --git a/fedora_submit.py b/fedora_submit.py
index 76c040d..e20cfb6 100755
--- a/fedora_submit.py
+++ b/fedora_submit.py
@@ -2,6 +2,7 @@
#
# Licensed under the terms of the GNU GPL License version 2
+from __future__ import print_function
from fedora.client import OpenIdBaseClient
import getpass
import sys, getopt
@@ -14,11 +15,11 @@ argv = sys.argv[1:]
try:
opts, args = getopt.getopt(argv,"hu:p:l:",["user=","password=", "logfile="])
except getopt.GetoptError:
- print 'fedora_submit.py -u <fasuser> [-p <password>] -l <logfile>'
+ print('fedora_submit.py -u <fasuser> [-p <password>] -l <logfile>')
sys.exit(2)
for opt, arg in opts:
if opt == '-h':
- print 'fedora_submit.py -u <fasuser> [-p <password>] -l <logfile>'
+ print('fedora_submit.py -u <fasuser> [-p <password>] -l <logfile>')
sys.exit()
elif opt in ("-u", "--user"):
username = arg
@@ -28,7 +29,7 @@ for opt, arg in opts:
log = arg
if username == '' or log == '':
- print 'fedora_submit.py -u <fasuser> [-p <password>] -l <logfile>'
+ print('fedora_submit.py -u <fasuser> [-p <password>] -l <logfile>')
sys.exit(2)
if password == '':
password = getpass.getpass('FAS password: ')
@@ -51,4 +52,4 @@ req = submitclient.send_request(
files= { 'test_result': ('logfile', open(log, 'rb'), 'text/x-log'),}
)
-print req.message
+print(req.message)
7 years, 11 months
Re: kernel checkout specific version
by Josh Boyer
On Sun, Dec 20, 2015 at 10:37:48AM +0100, Philip Brown wrote:
> Hi,
>
> I would appreciate a little help please.
> I am building the kernel with the following commands:
Emailing kernel-owner doesn't work 99% of the time. It's better to
email the Fedora kernel list for these kinds of questions (now CC'd).
> fedpkg clone -a kernel
> cd kernel
> git checkout -b f23 --track origin/f23
> fedpkg local
>
> and this builds a 4.2.8-300 release, however I need to build a
> 4.2.7-300 release which fedora is currently running on.
>
> how would I alter my command to achieve this.
You need to look in koji for the specific build, and use the sha1sum
hash that version was built from. You can do this by navigating the
build webpages, or using the koji command line client. The client
method is below:
[jwboyer@vader ~]$ koji buildinfo kernel-4.2.7-300.fc23 | head -n 5
BUILD: kernel-4.2.7-300.fc23 [704495]
State: COMPLETE
Built by: jforbes
Volume: DEFAULT
Task: 12130200 build (f23-candidate,
/kernel:827b8d0864402142f735d3e8cef8d20ae094e2d7)
The hash is listed there ^^^^.
Then go to your checkout you've done with fedpkg and run:
git reset --hard 827b8d0864402142f735d3e8cef8d20ae094e2d7
and your local repo will be reset to the same commit that was used to
build 4.2.7-300.fc23.
josh
7 years, 11 months
kernel-tests master: Adapt to status returned by upload (bbc0fd7)
by Justin Forbes
Repository : http://git.fedorahosted.org/cgit/kernel-tests.git
On branch : master
>---------------------------------------------------------------
commit bbc0fd7f6f5085547b4604b7bca4ba61b138df7b
Author: Zbigniew J��drzejewski-Szmek <zbyszek(a)in.waw.pl>
Date: Wed Dec 9 01:39:38 2015 +0000
Adapt to status returned by upload
The result has "message", not "text", field.
>---------------------------------------------------------------
fedora_submit.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fedora_submit.py b/fedora_submit.py
index 0461f36..76c040d 100755
--- a/fedora_submit.py
+++ b/fedora_submit.py
@@ -51,4 +51,4 @@ req = submitclient.send_request(
files= { 'test_result': ('logfile', open(log, 'rb'), 'text/x-log'),}
)
-print req.text
+print req.message
7 years, 11 months
[PATCH] Make GPIO pinctrl for CherryTrail builtin
by Bastien Nocera
From: Bastien Nocera <hadess(a)hadess.net>
As for the BayTrail one.
---
config-x86-generic | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config-x86-generic b/config-x86-generic
index ee29523..19daf7c 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -527,7 +527,7 @@ CONFIG_PWM_LPSS_PCI=m
CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PINCTRL=y
CONFIG_PINCTRL_BAYTRAIL=y
-CONFIG_PINCTRL_CHERRYVIEW=m
+CONFIG_PINCTRL_CHERRYVIEW=y
# CONFIG_PINCTRL_AMD is not set
CONFIG_PINCTRL_SUNRISEPOINT=m
CONFIG_PINCTRL_BROXTON=m
--
2.5.0
7 years, 12 months
