lockdev: Switch to use archive tarballs for SRC_URI
PATCH 1/1 lockdev: Switch to use archive tarballs for SRC_URI
anonscm.debian.org has been replaced with https://salsa.debian.org
however, lockdev has been dropped from debian packages, so its not maintained at salsa.debian.org, therefore resort to archives and add few more fixes to get it building from archive.
bump PE since version still remains 1.0.3 but we drop +git${...} from PV
Signed-off-by Khem Raj <[email protected]>
--- ...macros.h-for-major-minor-definitions.patch | 30 ------------------- .../lockdev/lockdev/build.patch | 28 +++++++++++++++++ .../lockdev/lockdev/cross_compile.patch | 25 ++++++++++++++++ .../recipes-support/lockdev/lockdev_1.0.3.bb | 29 ++++++++++++++++++ .../recipes-support/lockdev/lockdev_git.bb | 24 --------------- 5 files changed, 82 insertions(+), 54 deletions(-) delete mode 100644 meta-oe/recipes-support/lockdev/lockdev/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch create mode 100644 meta-oe/recipes-support/lockdev/lockdev/build.patch create mode 100644 meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch create mode 100644 meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb delete mode 100644 meta-oe/recipes-support/lockdev/lockdev_git.bb
meta-oe/recipes-support/lockdev/lockdev/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 2f39dc3d6f920c0826aa74367da1a0a7cc49b0fe Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 11 Aug 2018 15:18:04 -0700 -Subject: [PATCH] include sys/sysmacros.h for major/minor definitions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -inclusion of <sys/sysmacros.h> by <sys/types.h> is deprecated. -This means that in a future release, the macros “major”, “minor”, and -“makedev” will only be available from <sys/sysmacros.h>. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - src/lockdev.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lockdev.c b/src/lockdev.c -index 9a0fca5..3581938 100644 ---- a/src/lockdev.c -+++ b/src/lockdev.c -@@ -117,6 +117,7 @@ - #include <sys/stat.h> - #include <sys/file.h> - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <sys/wait.h> - #include "lockdev.h" - #include "ttylock.h"
meta-oe/recipes-support/lockdev/lockdev/build.patch new file +28 -0
@@ -0,0 +1,28 @@ +commit 0dd47123655c52d68185f06b9da8fb0e1b925400 +Author: Ludwig Nussel <[email protected]> +Date: Tue Feb 9 14:56:23 2010 +0100 + + RedHat patch 2 + + - change library file name + - install devel symlink + +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,7 @@ VER = $(shell expr `pwd` : '.*-\([0-9.]* + MVER = ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'} + + static = ${libname}.a +-shared = ${libname}.${VER}.so ++shared = ${libname}.so.${VER} + soname = ${libname}.so.${MVER} + + # overwritten by caller (e.g.: debian/rules) +@@ -72,6 +72,7 @@ install_doc: docs/lockdev.3 + install_run: ${shared} + install -m755 -d ${libdir} + install -m644 ${shared} ${libdir} ++ ln -s ${shared} ${libdir}/liblockdev.so + + .PHONY: clean distclean perl-clean mostyclean + perl-clean: clean
meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch new file +25 -0
@@ -0,0 +1,25 @@ +--- a/Makefile ++++ b/Makefile +@@ -15,17 +15,17 @@ shared = ${libname}.${VER}.so + soname = ${libname}.so.${MVER} + + # overwritten by caller (e.g.: debian/rules) +-basedir = /usr/local ++basedir ?= /usr/local + srcdir=. + + libdir = ${basedir}/lib + incdir = ${basedir}/include + mandir = ${basedir}/share/man + +-CC = gcc +-LCFLAGS = -g -O2 -fPIC -Wall -pipe -D_REENTRANT +-CFLAGS = -g +-LDLIBS = -llockdev ++CC ?= gcc ++LCFLAGS ?= -g -O2 -fPIC -Wall -pipe -D_REENTRANT ++CFLAGS ?= -g ++LDLIBS ?= -llockdev + + .PHONY: shared static perl-lib + ALL: shared static perl-lib
meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb new file +29 -0
@@ -0,0 +1,29 @@ +SUMMARY = "Locking devices library" +SECTION = "libs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM="file://LICENSE;md5=d8045f3b8f929c1cb29a1e3fd737b499" + +PE = "1" +SRC_URI = "http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_${PV}.orig.tar.gz \ + http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_${PV}-1.6.diff.gz;name=debianpatch \ + file://cross_compile.patch \ + file://build.patch \ + " +SRC_URI[md5sum] = "64b9c1b87b125fc348e892e24625524a" +SRC_URI[sha256sum] = "ccae635d7ac3fdd50897eceb250872b3d9a191d298f213e7f0c836910d869f82" +SRC_URI[debianpatch.md5sum] = "5ef6267c42fca9145e0af006ccb6aff7" +SRC_URI[debianpatch.sha256sum] = "a5405c6ee5e97e45eeb1c81330a7e9f444a58bda5e6771fa30007516c115007e" + +inherit lib_package perlnative +export basedir="${D}${prefix}" + +CFLAGS += " -D__GNU_LIBRARY__" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_compile() { + oe_runmake basedir=${D}${prefix} LD="${CC}" LD="${CC}" shared static +} +do_install() { + oe_runmake DESTDIR=${D} basedir=${D}${prefix} install +}
meta-oe/recipes-support/lockdev/lockdev_git.bb deleted +0 -24
@@ -1,24 +0,0 @@ -SUMMARY = "Locking devices library" -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM="file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -PV = "1.0.3+git${SRCPV}" - -SRCREV = "16b899645d32012cc94cc9232f64d4ddaaf0b795" -SRC_URI = "git://anonscm.debian.org/lockdev/lockdev.git \ - file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \ - " - -S = "${WORKDIR}/git" - -inherit lib_package autotools-brokensep - -do_configure_prepend () { - ./scripts/git-version > VERSION - - # Make automake happy - touch ChangeLog -} - -CFLAGS_append_libc-musl = " -D__GNU_LIBRARY__"
Signature · 1 line
2.20.1