diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-20 14:14:59 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-20 14:14:59 +0100 |
| commit | 8c48cabfda5bcfcdb85d542f09cf3e8f096fd16e (patch) | |
| tree | fd6f4b571a25ed8f337ae6d12536a7ee8222d74d /package | |
| parent | 088ee8298fcccb17f7737ba1db67f5c8573005e1 (diff) | |
| parent | b69cbbf603cf1a960fbdf6bfdf819df75c0a8efb (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/corosync/Makefile | 1 | ||||
| -rw-r--r-- | package/pacemaker-mgmt/Makefile | 1 | ||||
| -rw-r--r-- | package/util-linux/Makefile | 2 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-libuuid_uuid_pc_in | 13 |
4 files changed, 16 insertions, 1 deletions
diff --git a/package/corosync/Makefile b/package/corosync/Makefile index 56fcc4e62..902b773a0 100644 --- a/package/corosync/Makefile +++ b/package/corosync/Makefile @@ -16,6 +16,7 @@ PKG_SITES:= http://corosync.org/download/ PKG_CFLINE_COROSYNC:= select ADK_KERNEL_IP_MULTICAST PKG_LIBC_DEPENDS:= eglibc glibc musl +PKG_ARCH_DEPENDS:= x86 x86_64 include $(TOPDIR)/mk/package.mk diff --git a/package/pacemaker-mgmt/Makefile b/package/pacemaker-mgmt/Makefile index 9dad6eba6..29ece82cd 100644 --- a/package/pacemaker-mgmt/Makefile +++ b/package/pacemaker-mgmt/Makefile @@ -14,6 +14,7 @@ PKG_URL:= http://hg.clusterlabs.org/pacemaker/pygui/ PKG_SITES:= http://openadk.org/distfiles/ PKG_LIBC_DEPENDS:= eglibc glibc musl +PKG_ARCH_DEPENDS:= x86 x86_64 include $(TOPDIR)/mk/package.mk diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index a99c5ed0d..591158f24 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux PKG_VERSION:= 2.23.2 -PKG_RELEASE:= 5 +PKG_RELEASE:= 6 PKG_MD5SUM:= b39fde897334a4858bb2098edcce5b3f PKG_DESCR:= Linux utilities (meta-package) PKG_SECTION:= utils diff --git a/package/util-linux/patches/patch-libuuid_uuid_pc_in b/package/util-linux/patches/patch-libuuid_uuid_pc_in new file mode 100644 index 000000000..059310086 --- /dev/null +++ b/package/util-linux/patches/patch-libuuid_uuid_pc_in @@ -0,0 +1,13 @@ +--- util-linux-2.23.2.orig/libuuid/uuid.pc.in 2013-02-27 17:46:29.883020734 +0100 ++++ util-linux-2.23.2/libuuid/uuid.pc.in 2013-12-17 17:07:37.935403478 +0100 +@@ -1,7 +1,7 @@ + prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@usrlib_execdir@ +-includedir=@includedir@ ++exec_prefix=${prefix} ++libdir=${prefix}/lib ++includedir=${prefix}/include + + Name: uuid + Description: Universally unique id library |