[PATCH 1/5] updated parted to 3.3 removed integrated patch
From: Joerg Seitter <oss@seitter.net> Signed-off-by: Joerg Seitter <oss@seitter.net> --- package/parted/Makefile | 6 ++-- .../parted/patches/patch-libparted_arch_linux_c | 41 ---------------------- 2 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 package/parted/patches/patch-libparted_arch_linux_c diff --git a/package/parted/Makefile b/package/parted/Makefile index 41e59b96c..86528d6ae 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= parted -PKG_VERSION:= 3.2 -PKG_RELEASE:= 3 -PKG_HASH:= 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 +PKG_VERSION:= 3.3 +PKG_RELEASE:= 4 +PKG_HASH:= 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 PKG_DESCR:= partition table editor PKG_SECTION:= sys/fs PKG_DEPENDS:= libblkid libuuid libncurses diff --git a/package/parted/patches/patch-libparted_arch_linux_c b/package/parted/patches/patch-libparted_arch_linux_c deleted file mode 100644 index 7a8efcf04..000000000 --- a/package/parted/patches/patch-libparted_arch_linux_c +++ /dev/null @@ -1,41 +0,0 @@ ---- parted-3.2.orig/libparted/arch/linux.c 2014-06-15 14:15:54.000000000 -0500 -+++ parted-3.2/libparted/arch/linux.c 2015-01-03 14:10:43.244848741 -0600 -@@ -2304,6 +2304,7 @@ zasprintf (const char *format, ...) - return r < 0 ? NULL : resultp; - } - -+#ifdef ENABLE_DEVICE_MAPPER - static char * - dm_canonical_path (PedDevice const *dev) - { -@@ -2326,12 +2327,17 @@ dm_canonical_path (PedDevice const *dev) - err: - return NULL; - } -+#endif - - static char* - _device_get_part_path (PedDevice const *dev, int num) - { -+#ifdef ENABLE_DEVICE_MAPPER - char *devpath = (dev->type == PED_DEVICE_DM - ? dm_canonical_path (dev) : dev->path); -+#else -+ char *devpath = dev->path; -+#endif - size_t path_len = strlen (devpath); - char *result; - /* Check for devfs-style /disc => /partN transformation -@@ -2946,10 +2952,12 @@ _disk_sync_part_table (PedDisk* disk) - - - if (disk->dev->type == PED_DEVICE_DM) { -+#ifdef ENABLE_DEVICE_MAPPER - add_partition = _dm_add_partition; - remove_partition = _dm_remove_partition; - resize_partition = _dm_resize_partition; - get_partition_start_and_length = _dm_get_partition_start_and_length; -+#endif - } else { - add_partition = _blkpg_add_partition; - remove_partition = _blkpg_remove_partition; -- 2.11.0
From: Joerg Seitter <oss@seitter.net> Signed-off-by: Joerg Seitter <oss@seitter.net> --- package/opkg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opkg/Makefile b/package/opkg/Makefile index 593e1bfff..606d01e98 100644 --- a/package/opkg/Makefile +++ b/package/opkg/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= f607f0e61be8cf8a3bbd0d2dccd9ec9e9b6c21dd4307b671c600d6eeaf84d30b PKG_DESCR:= embedded package manager PKG_DEPENDS:= libcurl libarchive gpgme libressl xz PKG_BUILDDEP:= curl libarchive gpgme xz libressl -HOST_BUILDDEP:= libarchive-host curl-host +HOST_BUILDDEP:= libarchive-host curl-host cpio-host PKG_NEEDS:= threads PKG_SECTION:= sys/misc PKG_URL:= http://git.yoctoproject.org/cgit/cgit.cgi/opkg/ -- 2.11.0
From: Joerg Seitter <oss@seitter.net> Signed-off-by: Joerg Seitter <oss@seitter.net> --- package/bzip2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index 7f7336e4b..f53535eba 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -13,7 +13,7 @@ PKG_BUILDDEP:= bzip2-host PKG_DEPENDS:= libbz2 HOST_BUILDDEP:= patch-host PKG_URL:= http://www.bzip.org/ -PKG_SITES:= http://www.bzip.org/${PKG_VERSION}/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} PKG_LIBNAME:= libbz2 PKG_OPTS:= dev -- 2.11.0
From: Joerg Seitter <oss@seitter.net> Signed-off-by: Joerg Seitter <oss@seitter.net> --- package/libmodbus/Makefile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/libmodbus/Makefile diff --git a/package/libmodbus/Makefile b/package/libmodbus/Makefile new file mode 100644 index 000000000..ee8e82b55 --- /dev/null +++ b/package/libmodbus/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= libmodbus +PKG_VERSION:= 3.1.6 +PKG_RELEASE:= 1 +PKG_HASH:= d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16 +PKG_DESCR:= MODBUS protocol library +PKG_SECTION:= libs/net +PKG_URL:= http://libmodbus.org +PKG_SITES:= https://libmodbus.org/releases/ +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBMODBUS,libmodbus,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIGURE_ARGS+= --without-documentation --disable-tests + +libmodbus-install: + $(INSTALL_DIR) $(IDIR_LIBMODBUS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libmodbus*.so* \ + $(IDIR_LIBMODBUS)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- 2.11.0
From: Joerg Seitter <oss@seitter.net> Signed-off-by: Joerg Seitter <oss@seitter.net> --- package/opkg/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opkg/Makefile b/package/opkg/Makefile index 606d01e98..da1647322 100644 --- a/package/opkg/Makefile +++ b/package/opkg/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= opkg -PKG_VERSION:= 0.3.6 +PKG_VERSION:= 0.4.2 PKG_RELEASE:= 1 -PKG_HASH:= f607f0e61be8cf8a3bbd0d2dccd9ec9e9b6c21dd4307b671c600d6eeaf84d30b +PKG_HASH:= 86887852c43457edfff9d8b6d9520f3f1cdd55f25eb600a6eb31e1c4e151e106 PKG_DESCR:= embedded package manager PKG_DEPENDS:= libcurl libarchive gpgme libressl xz PKG_BUILDDEP:= curl libarchive gpgme xz libressl -- 2.11.0
participants (2)
-
Joerg Seitter -
Waldemar Brodkorb