Skip to content

[meta-oe][morty] risk-free cherry-pick fixes for gitver.bbclass and devmem.bb #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
amery wants to merge 3 commits into from
Closed

[meta-oe][morty] risk-free cherry-pick fixes for gitver.bbclass and devmem.bb #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b6caf7
devmem2: Change source URL to regain access to it
noglitch Feb 28, 2017
ab538dd
devmem2: use different filename to avoid checksum conflicts
denix0 Mar 14, 2017
077fa5d
gitver: fix try/except syntax for python3 support
Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions meta-oe/classes/gitver.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ def get_git_pv(path, d, tagadjust=None):
gitdir = os.path.abspath(os.path.join(d.getVar("S", True), ".git"))
try:
ver = gitrev_run("git describe --tags", gitdir)
except Exception, exc:
except Exception as exc:
bb.fatal(str(exc))

if not ver:
try:
ver = gitrev_run("git rev-parse --short HEAD", gitdir)
except Exception, exc:
except Exception as exc:
bb.fatal(str(exc))

if ver:
Expand Down
12 changes: 8 additions & 4 deletions meta-oe/recipes-support/devmem2/devmem2.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
SUMMARY = "Simple program to read/write from/to any location in memory"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://devmem2.c;endline=28;md5=dd68f2b0a5184b3db3dc25c99e0bd0cd"
LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf"
PR = "r7"

SRC_URI = "http://www.lartmaker.nl/lartware/port/devmem2.c \
SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \
file://devmem2-fixups-2.patch;apply=yes;striplevel=0"
S = "${WORKDIR}"

CFLAGS += "-DFORCE_STRICT_ALIGNMENT"

python do_unpack_append() {
os.rename("devmem2-new.c", "devmem2.c")
}

do_compile() {
${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
}
Expand All @@ -18,5 +22,5 @@ do_install() {
install devmem2 ${D}${bindir}
}

SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
SRC_URI[sha256sum] = "ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191"
SRC_URI[md5sum] = "e23f236e94be4c429aa1ceac0f01544b"
SRC_URI[sha256sum] = "3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639"