diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-devtools')
61 files changed, 1986 insertions, 256 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup new file mode 100644 index 000000000..f7d997372 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup @@ -0,0 +1,25 @@ +#!/bin/sh + +# TODO enable the lines below once we have support for getprop +# retrieve the product info from Android +# manufacturer=$(getprop ro.product.manufacturer Android) +# model=$(getprop ro.product.model Android) +# serial=$(getprop ro.serialno 0123456789ABCDEF) + +manufacturer="$(cat /system/build.prop | grep -o 'ro.product.manufacturer=.*' | cut -d'=' -f 2)" +model="$(cat /system/build.prop | grep -o 'ro.product.model=.*' | cut -d'=' -f 2)" +# get the device serial number from /proc/cmdline directly(since we have no getprop on +# GNU/Linux) +serial="$(cat /proc/cmdline | sed 's/.*androidboot.serialno=//' | sed 's/ .*//')" + +echo $serial > /sys/class/android_usb/android0/iSerial +echo $manufacturer > /sys/class/android_usb/android0/iManufacturer +echo $model > /sys/class/android_usb/android0/iProduct + +echo "0" > /sys/class/android_usb/android0/enable +echo "18d1" > /sys/class/android_usbid_usb/android0/idVendor +echo "D002" > /sys/class/android_usb/android0/idProduct +echo "adb" > /sys/class/android_usb/android0/functions +echo "1" > /sys/class/android_usb/android0/enable + +sleep 4 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb new file mode 100644 index 000000000..af98f92f0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Different utilities from Android - corressponding configuration files" +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = "file://android-gadget-setup" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} +} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore new file mode 100644 index 000000000..b8a08f824 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore @@ -0,0 +1,57 @@ +* +!.gitignore +!*.indirectionsymlink +!*.[ch] +!*.mk +!NOTICE +!MODULE_LICENSE_* +!/system/ +!/system/core/ +!/system/core/adb/ +!/system/core/fastboot/ +!/system/core/fs_mgr/ +!/system/core/fs_mgr/include/ +!/system/core/include/ +!/system/core/include/android/ +!/system/core/include/cutils/ +!/system/core/include/log/ +!/system/core/include/mincrypt/ +!/system/core/include/private/ +!/system/core/include/utils/ +!/system/core/include/zipfile/ +!/system/core/liblog/ +!/system/core/liblog/tests/ +!/system/core/libcutils/ +!/system/core/libmincrypt/ +!/system/core/libzipfile/ +!/system/core/libsparse/ +!/system/core/libsparse/include/ +!/system/core/libsparse/include/sparse/ +!/system/core/libsparse/simg_dump.py +!/system/core/mkbootimg/ +!/system/extras/ +!/system/extras/ext4_utils/ +!/system/extras/ext4_utils/mkuserimg.sh +!/system/extras/ext4_utils/test_ext4fixup +!/system/extras/f2fs_utils/ +!/hardware/ +!/hardware/libhardware/ +!/hardware/libhardware/include/ +!/hardware/libhardware/include/hardware/ +!/external/ +!/external/libselinux/ +!/external/libselinux/include/ +!/external/libselinux/include/selinux/ +!/external/libselinux/src/ +!/external/f2fs-tools/ +!/external/f2fs-tools/include/ +!/external/f2fs-tools/lib/ +!/external/f2fs-tools/mkfs/ +!/build/ +!/build/core/ +!/build/core/version_defaults.mk +!/build/core/combo/ +!/build/core/combo/include/ +!/build/core/combo/include/arch/ +!/build/core/combo/include/arch/linux-*/ +!/build/core/combo/include/arch/linux-*/AndroidConfig.h diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk new file mode 100644 index 000000000..0687c22c1 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk @@ -0,0 +1,72 @@ +# Makefile for adb + +SRCDIR ?= $(S) + +VPATH += $(SRCDIR)/system/core/adb +adb_SRC_FILES += adb.c +adb_SRC_FILES += console.c +adb_SRC_FILES += transport.c +adb_SRC_FILES += transport_local.c +adb_SRC_FILES += transport_usb.c +adb_SRC_FILES += commandline.c +adb_SRC_FILES += adb_client.c +adb_SRC_FILES += adb_auth_host.c +adb_SRC_FILES += sockets.c +adb_SRC_FILES += services.c +adb_SRC_FILES += file_sync_client.c +adb_SRC_FILES += get_my_path_linux.c +adb_SRC_FILES += usb_linux.c +adb_SRC_FILES += usb_vendors.c +adb_SRC_FILES += fdevent.c +adb_OBJS := $(adb_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libcutils +libcutils_SRC_FILES += atomic.c +libcutils_SRC_FILES += hashmap.c +libcutils_SRC_FILES += native_handle.c +libcutils_SRC_FILES += config_utils.c +libcutils_SRC_FILES += cpu_info.c +libcutils_SRC_FILES += load_file.c +# libcutils_SRC_FILES += open_memstream.c +# libcutils_SRC_FILES += strdup16to8.c +# libcutils_SRC_FILES += strdup8to16.c +# libcutils_SRC_FILES += record_stream.c +# libcutils_SRC_FILES += process_name.c +# libcutils_SRC_FILES += threads.c +# libcutils_SRC_FILES += sched_policy.c +# libcutils_SRC_FILES += iosched_policy.c +libcutils_SRC_FILES += str_parms.c +libcutils_SRC_FILES += fs.c +libcutils_SRC_FILES += multiuser.c +libcutils_SRC_FILES += socket_inaddr_any_server.c +libcutils_SRC_FILES += socket_local_client.c +libcutils_SRC_FILES += socket_local_server.c +libcutils_SRC_FILES += socket_loopback_client.c +libcutils_SRC_FILES += socket_loopback_server.c +libcutils_SRC_FILES += socket_network_client.c +libcutils_SRC_FILES += sockets.c +libcutils_SRC_FILES += ashmem-host.c +libcutils_SRC_FILES += dlmalloc_stubs.c +libcutils_OBJS := $(libcutils_SRC_FILES:.c=.o) + +CFLAGS += -DANDROID +CFLAGS += -DWORKAROUND_BUG6558362 +CFLAGS += -DADB_HOST=1 +CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE +CFLAGS += -DANDROID_SMP=0 +CFLAGS += -I$(SRCDIR)/system/core/adb +CFLAGS += -I$(SRCDIR)/system/core/include +CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h + +LIBS += libcutils.a -lpthread -lcrypto + +all: adb + +adb: libcutils.a $(adb_OBJS) + $(CC) -o $@ $(LDFLAGS) $(adb_OBJS) $(LIBS) + +libcutils.a: $(libcutils_OBJS) + $(AR) rcs $@ $(libcutils_OBJS) + +clean: + $(RM) $(adb_OBJS) $(libcutils_OBJS) adb *.a diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk new file mode 100644 index 000000000..84cd06b10 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk @@ -0,0 +1,163 @@ +# Makefile for adbd + +SRCDIR ?= $(S) + +VPATH += $(SRCDIR)/system/core/adb +adbd_SRC_FILES += adb.c +adbd_SRC_FILES += fdevent.c +adbd_SRC_FILES += transport.c +adbd_SRC_FILES += transport_local.c +adbd_SRC_FILES += transport_usb.c +adbd_SRC_FILES += adb_auth_client.c +adbd_SRC_FILES += sockets.c +adbd_SRC_FILES += services.c +adbd_SRC_FILES += file_sync_service.c +adbd_SRC_FILES += jdwp_service.c +adbd_SRC_FILES += framebuffer_service.c +adbd_SRC_FILES += remount_service.c +adbd_SRC_FILES += disable_verity_service.c +adbd_SRC_FILES += usb_linux_client.c +adbd_OBJS := $(adbd_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/liblog +liblog_SRC_FILES += logd_write.c +liblog_SRC_FILES += log_event_write.c +liblog_SRC_FILES += logprint.c +liblog_SRC_FILES += event_tag_map.c +liblog_SRC_FILES += fake_log_device.c +liblog_OBJS := $(liblog_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/fs_mgr +fs_mgr_SRC_FILES += fs_mgr_fstab.c +fs_mgr_OBJS := $(fs_mgr_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libcutils +libcutils_SRC_FILES += atomic.c +libcutils_SRC_FILES += hashmap.c +libcutils_SRC_FILES += native_handle.c +libcutils_SRC_FILES += config_utils.c +libcutils_SRC_FILES += cpu_info.c +libcutils_SRC_FILES += load_file.c +# libcutils_SRC_FILES += open_memstream.c +# libcutils_SRC_FILES += strdup16to8.c +# libcutils_SRC_FILES += strdup8to16.c +# libcutils_SRC_FILES += record_stream.c +# libcutils_SRC_FILES += process_name.c +# libcutils_SRC_FILES += threads.c +# libcutils_SRC_FILES += sched_policy.c +# libcutils_SRC_FILES += iosched_policy.c +libcutils_SRC_FILES += str_parms.c +libcutils_SRC_FILES += fs.c +libcutils_SRC_FILES += multiuser.c +libcutils_SRC_FILES += socket_inaddr_any_server.c +libcutils_SRC_FILES += socket_local_client.c +libcutils_SRC_FILES += socket_local_server.c +libcutils_SRC_FILES += socket_loopback_client.c +libcutils_SRC_FILES += socket_loopback_server.c +libcutils_SRC_FILES += socket_network_client.c +libcutils_SRC_FILES += sockets.c +libcutils_SRC_FILES += ashmem-host.c +libcutils_SRC_FILES += dlmalloc_stubs.c +libcutils_SRC_FILES += klog.c +libcutils_SRC_FILES += properties.c +libcutils_OBJS := $(libcutils_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/external/libselinux/src +libselinux_SRC_FILES += booleans.c +libselinux_SRC_FILES += canonicalize_context.c +libselinux_SRC_FILES += disable.c +libselinux_SRC_FILES += enabled.c +libselinux_SRC_FILES += fgetfilecon.c +libselinux_SRC_FILES += fsetfilecon.c +libselinux_SRC_FILES += getenforce.c +libselinux_SRC_FILES += getfilecon.c +libselinux_SRC_FILES += getpeercon.c +libselinux_SRC_FILES += lgetfilecon.c +libselinux_SRC_FILES += load_policy.c +libselinux_SRC_FILES += lsetfilecon.c +libselinux_SRC_FILES += policyvers.c +libselinux_SRC_FILES += procattr.c +libselinux_SRC_FILES += setenforce.c +libselinux_SRC_FILES += setfilecon.c +libselinux_SRC_FILES += context.c +libselinux_SRC_FILES += mapping.c +libselinux_SRC_FILES += stringrep.c +libselinux_SRC_FILES += compute_create.c +libselinux_SRC_FILES += compute_av.c +libselinux_SRC_FILES += avc.c +libselinux_SRC_FILES += avc_internal.c +libselinux_SRC_FILES += avc_sidtab.c +libselinux_SRC_FILES += get_initial_context.c +libselinux_SRC_FILES += checkAccess.c +libselinux_SRC_FILES += sestatus.c +libselinux_SRC_FILES += deny_unknown.c + +libselinux_SRC_FILES += callbacks.c +libselinux_SRC_FILES += check_context.c +libselinux_SRC_FILES += freecon.c +libselinux_SRC_FILES += init.c +libselinux_SRC_FILES += label.c +libselinux_SRC_FILES += label_file.c +libselinux_SRC_FILES += label_android_property.c +libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/extras/ext4_utils +libext4_utils_SRC_FILES += make_ext4fs.c +libext4_utils_SRC_FILES += ext4fixup.c +libext4_utils_SRC_FILES += ext4_utils.c +libext4_utils_SRC_FILES += allocate.c +libext4_utils_SRC_FILES += contents.c +libext4_utils_SRC_FILES += extent.c +libext4_utils_SRC_FILES += indirect.c +libext4_utils_SRC_FILES += uuid.c +libext4_utils_SRC_FILES += sha1.c +libext4_utils_SRC_FILES += wipe.c +libext4_utils_SRC_FILES += crc16.c +libext4_utils_SRC_FILES += ext4_sb.c +libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o) + +CFLAGS += -std=gnu11 +CFLAGS += -DANDROID +CFLAGS += -DADB_HOST=0 +CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE +CFLAGS += -DALLOW_ADBD_ROOT=1 +CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1 +CFLAGS += -DPROP_NAME_MAX=32 +CFLAGS += -DPROP_VALUE_MAX=92 +CFLAGS += -DAUDITD_LOG_TAG=1003 +# CFLAGS += -DHOST +CFLAGS += -DANDROID_SMP=0 +CFLAGS += -I$(SRCDIR)/system/core/adb +CFLAGS += -I$(SRCDIR)/system/core/include +CFLAGS += -I$(SRCDIR)/system/core/libsparse/include +CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils +CFLAGS += -I$(SRCDIR)/system/core/fs_mgr/include +CFLAGS += -I$(SRCDIR)/hardware/libhardware/include +CFLAGS += -I$(SRCDIR)/external/libselinux/include +CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h + +LIBS += liblog.a libfs_mgr.a libcutils.a libselinux.a libext4_utils.a -lpthread -lbsd -lpcre -lresolv -lcrypto + +all: adbd + +adbd: liblog.a libfs_mgr.a libcutils.a libselinux.a libext4_utils.a $(adbd_OBJS) + $(CC) -o $@ $(LDFLAGS) $(adbd_OBJS) $(LIBS) + +liblog.a: $(liblog_OBJS) + $(AR) rcs $@ $(liblog_OBJS) + +libfs_mgr.a: $(fs_mgr_OBJS) + $(AR) rcs $@ $(fs_mgr_OBJS) + +libcutils.a: $(libcutils_OBJS) + $(AR) rcs $@ $(libcutils_OBJS) + +libselinux.a: $(libselinux_OBJS) + export CFLAGS="-DANDROID -DHOST" + $(AR) rcs $@ $(libselinux_OBJS) + +libext4_utils.a: $(libext4_utils_OBJS) + $(AR) rcs $@ $(libext4_utils_OBJS) + +clean: + $(RM) *.o *.a adbd diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service new file mode 100644 index 000000000..88ed6871d --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Android Debug Bridge + +[Service] +Type=simple +Restart=on-failure +ExecStartPre=/usr/bin/android-gadget-setup adb +ExecStart=/usr/bin/adbd +StandardOutput=null + +[Install] +WantedBy=basic.target diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/define-shell-command.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/define-shell-command.patch new file mode 100644 index 000000000..8381967c4 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/define-shell-command.patch @@ -0,0 +1,23 @@ +Description: we intend to run on Linux system so the shell is always /bin/sh, + for the host or the target. +Author: Fathi Boudra <fabo@debian.org> + +Upstream-Status: Inappropriate +--- + system/core/adb/services.c | 4 ---- + 1 file changed, 4 deletions(-) + +--- a/system/core/adb/services.c ++++ b/system/core/adb/services.c +@@ -299,11 +299,7 @@ static int create_subproc_raw(const char + } + #endif /* !ABD_HOST */ + +-#if ADB_HOST + #define SHELL_COMMAND "/bin/sh" +-#else +-#define SHELL_COMMAND "/system/bin/sh" +-#endif + + #if !ADB_HOST + static void subproc_waiter_service(int fd, void *cookie) diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk new file mode 100644 index 000000000..c18aa9c4d --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk @@ -0,0 +1,103 @@ +# Makefile for ext4_utils + +SRCDIR ?= $(S) + +VPATH += $(SRCDIR)/system/extras/ext4_utils +make_ext4fs_SRC_FILES += make_ext4fs_main.c +make_ext4fs_SRC_FILES += canned_fs_config.c +make_ext4fs_OBJS := $(make_ext4fs_SRC_FILES:.c=.o) + +ext2simg_SRC_FILES += ext2simg.c +ext2simg_OBJS := $(ext2simg_SRC_FILES:.c=.o) + +ext4fixup_SRC_FILES += ext4fixup_main.c +ext4fixup_OBJS := $(ext4fixup_SRC_FILES:.c=.o) + +libext4_utils_SRC_FILES += make_ext4fs.c +libext4_utils_SRC_FILES += ext4fixup.c +libext4_utils_SRC_FILES += ext4_utils.c +libext4_utils_SRC_FILES += allocate.c +libext4_utils_SRC_FILES += contents.c +libext4_utils_SRC_FILES += extent.c +libext4_utils_SRC_FILES += indirect.c +libext4_utils_SRC_FILES += uuid.c +libext4_utils_SRC_FILES += sha1.c +libext4_utils_SRC_FILES += wipe.c +libext4_utils_SRC_FILES += crc16.c +libext4_utils_SRC_FILES += ext4_sb.c +libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libsparse +simg2img_SRC_FILES += simg2img.c +simg2img_SRC_FILES += sparse_crc32.c +simg2img_OBJS := $(simg2img_SRC_FILES:.c=.o) + +img2simg_SRC_FILES += img2simg.c +img2simg_OBJS := $(img2simg_SRC_FILES:.c=.o) + +simg2simg_SRC_FILES += simg2simg.c +simg2simg_SRC_FILES += sparse_crc32.c +simg2simg_OBJS := $(simg2simg_SRC_FILES:.c=.o) + +libsparse_SRC_FILES += backed_block.c +libsparse_SRC_FILES += output_file.c +libsparse_SRC_FILES += sparse.c +libsparse_SRC_FILES += sparse_crc32.c +libsparse_SRC_FILES += sparse_err.c +libsparse_SRC_FILES += sparse_read.c +libsparse_OBJS := $(libsparse_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/external/libselinux/src +libselinux_SRC_FILES += callbacks.c +libselinux_SRC_FILES += check_context.c +libselinux_SRC_FILES += freecon.c +libselinux_SRC_FILES += init.c +libselinux_SRC_FILES += label.c +libselinux_SRC_FILES += label_file.c +libselinux_SRC_FILES += label_android_property.c +libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o) + +CFLAGS += -DANDROID +CFLAGS += -DHOST +CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils +CFLAGS += -I$(SRCDIR)/system/core/include +CFLAGS += -I$(SRCDIR)/system/core/libsparse/include +CFLAGS += -I$(SRCDIR)/external/libselinux/include +CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h + +all: make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg + +make_ext4fs: libext4_utils.a libsparse.a libselinux.a $(make_ext4fs_OBJS) + $(CC) -o $@ $(LDFLAGS) $(make_ext4fs_OBJS) \ + libext4_utils.a libsparse.a libselinux.a -lz -lpcre + +ext2simg: libext4_utils.a libselinux.a libsparse.a $(ext2simg_OBJS) + $(CC) -o $@ $(LDFLAGS) $(ext2simg_OBJS) \ + libext4_utils.a libselinux.a libsparse.a -lz -lpcre + +ext4fixup: libext4_utils.a libsparse.a $(ext4fixup_OBJS) + $(CC) -o $@ $(LDFLAGS) $(ext4fixup_OBJS) libext4_utils.a libsparse.a -lz + +simg2img: libsparse.a $(simg2img_OBJS) + $(CC) -o $@ $(LDFLAGS) $(simg2img_OBJS) libsparse.a -lz + +img2simg: libsparse.a $(img2simg_OBJS) + $(CC) -o $@ $(LDFLAGS) $(img2simg_OBJS) libsparse.a -lz + +simg2simg: libsparse.a $(simg2simg_OBJS) + $(CC) -o $@ $(LDFLAGS) $(simg2simg_OBJS) libsparse.a -lz + +libext4_utils.a: $(libext4_utils_OBJS) + $(AR) rcs $@ $(libext4_utils_OBJS) + +libsparse.a: $(libsparse_OBJS) + $(AR) rcs $@ $(libsparse_OBJS) + +libselinux.a: $(libselinux_OBJS) + $(AR) rcs $@ $(libselinux_OBJS) + +clean: + $(RM) $(make_ext4fs_OBJS) $(ext2simg_OBJS) $(ext4fixup_OBJS) \ + $(simg2img_OBJS) $(img2simg_OBJS) $(simg2simg_OBJS) \ + $(libext4_utils_OBJS) $(libsparse_OBJS) $(libselinux_OBJS) \ + make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg *.a diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk new file mode 100644 index 000000000..b9ba95f38 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk @@ -0,0 +1,89 @@ +# Makefile for fastboot + +SRCDIR ?= $(S) + +VPATH += $(SRCDIR)/system/core/fastboot +fastboot_SRC_FILES += protocol.c +fastboot_SRC_FILES += engine.c +fastboot_SRC_FILES += bootimg.c +fastboot_SRC_FILES += fastboot.c +fastboot_SRC_FILES += util.c +fastboot_SRC_FILES += fs.c +fastboot_SRC_FILES += usb_linux.c +fastboot_SRC_FILES += util_linux.c +fastboot_OBJS := $(fastboot_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libzipfile +libzipfile_SRC_FILES += centraldir.c +libzipfile_SRC_FILES += zipfile.c +libzipfile_OBJS := $(libzipfile_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/extras/ext4_utils +libext4_utils_SRC_FILES += make_ext4fs.c +libext4_utils_SRC_FILES += ext4fixup.c +libext4_utils_SRC_FILES += ext4_utils.c +libext4_utils_SRC_FILES += allocate.c +libext4_utils_SRC_FILES += contents.c +libext4_utils_SRC_FILES += extent.c +libext4_utils_SRC_FILES += indirect.c +libext4_utils_SRC_FILES += uuid.c +libext4_utils_SRC_FILES += sha1.c +libext4_utils_SRC_FILES += wipe.c +libext4_utils_SRC_FILES += crc16.c +libext4_utils_SRC_FILES += ext4_sb.c +libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libsparse +libsparse_SRC_FILES += backed_block.c +libsparse_SRC_FILES += output_file.c +libsparse_SRC_FILES += sparse.c +libsparse_SRC_FILES += sparse_crc32.c +libsparse_SRC_FILES += sparse_err.c +libsparse_SRC_FILES += sparse_read.c +libsparse_OBJS := $(libsparse_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/external/libselinux/src +libselinux_SRC_FILES += callbacks.c +libselinux_SRC_FILES += check_context.c +libselinux_SRC_FILES += freecon.c +libselinux_SRC_FILES += init.c +libselinux_SRC_FILES += label.c +libselinux_SRC_FILES += label_file.c +libselinux_SRC_FILES += label_android_property.c +libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o) + +CFLAGS += -std=gnu11 +CFLAGS += -DANDROID +# CFLAGS += -DUSE_F2FS +CFLAGS += -DHOST +CFLAGS += -I$(SRCDIR)/system/core/fastboot +CFLAGS += -I$(SRCDIR)/system/core/include +CFLAGS += -I$(SRCDIR)/system/core/mkbootimg +CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils +CFLAGS += -I$(SRCDIR)/system/extras/f2fs_utils +CFLAGS += -I$(SRCDIR)/system/core/libsparse/include +CFLAGS += -I$(SRCDIR)/external/libselinux/include +CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h + +LIBS += libzipfile.a libext4_utils.a libsparse.a libselinux.a -lz -lpcre + +all: fastboot + +fastboot: libzipfile.a libext4_utils.a libsparse.a libselinux.a $(fastboot_OBJS) + $(CC) -o $@ $(LDFLAGS) $(fastboot_OBJS) $(LIBS) + +libzipfile.a: $(libzipfile_OBJS) + $(AR) rcs $@ $(libzipfile_OBJS) + +libext4_utils.a: $(libext4_utils_OBJS) + $(AR) rcs $@ $(libext4_utils_OBJS) + +libsparse.a: $(libsparse_OBJS) + $(AR) rcs $@ $(libsparse_OBJS) + +libselinux.a: $(libselinux_OBJS) + $(AR) rcs $@ $(libselinux_OBJS) + +clean: + $(RM) $(fastboot_OBJS) $(libzipfile_OBJS) $(libext4_utils_OBJS) \ + $(libsparse_OBJS) $(libselinux_OBJS) fastboot *.a diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch new file mode 100644 index 000000000..64db6168c --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch @@ -0,0 +1,42 @@ +Description: fix implicit declaration of stlcat/strlcopy functions. +Author: Fathi Boudra <fabo@debian.org> + +Upstream-Status: Inappropriate +--- + system/core/adb/adb.c | 1 + + system/core/fs_mgr/fs_mgr_fstab.c | 2 +- + system/core/include/cutils/sockets.h | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +--- a/system/core/fs_mgr/fs_mgr_fstab.c ++++ b/system/core/fs_mgr/fs_mgr_fstab.c +@@ -17,7 +17,7 @@ + #include <ctype.h> + #include <stdio.h> + #include <stdlib.h> +-#include <string.h> ++#include <bsd/string.h> + #include <sys/mount.h> + + #include "fs_mgr_priv.h" +--- a/system/core/include/cutils/sockets.h ++++ b/system/core/include/cutils/sockets.h +@@ -19,7 +19,7 @@ + + #include <errno.h> + #include <stdlib.h> +-#include <string.h> ++#include <bsd/string.h> + #include <stdbool.h> + + #ifdef HAVE_WINSOCK +--- a/system/core/adb/adb.c ++++ b/system/core/adb/adb.c +@@ -41,6 +41,7 @@ + #include <sys/prctl.h> + #include <getopt.h> + #include <selinux/selinux.h> ++#include <grp.h> + #else + #include "usb_vendors.h" + #endif diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg-Add-dt-parameter-to-specify-DT-image.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg-Add-dt-parameter-to-specify-DT-image.patch new file mode 100644 index 000000000..35bb766a7 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg-Add-dt-parameter-to-specify-DT-image.patch @@ -0,0 +1,108 @@ +From cc5e7b02a3be57709a1aed6e34be100b82a71620 Mon Sep 17 00:00:00 2001 +From: David Ng <dave@codeaurora.org> +Date: Fri, 27 Jul 2012 17:15:03 -0700 +Subject: [PATCH 1/2] mkbootimg: Add --dt parameter to specify DT image + +New optional --dt parameter to specify a kernel device +tree image. + +Change-Id: Ie29a11cbf4138426bfd19ae486d69a5fcbd8f442 + +Upstream-Status: Inappropriate +--- + system/core/mkbootimg/bootimg.h | 7 +++++-- + system/core/mkbootimg/mkbootimg.c | 21 +++++++++++++++++++++ + 2 files changed, 26 insertions(+), 2 deletions(-) + +--- a/system/core/mkbootimg/bootimg.h ++++ b/system/core/mkbootimg/bootimg.h +@@ -41,8 +41,8 @@ struct boot_img_hdr + + unsigned tags_addr; /* physical addr for kernel tags */ + unsigned page_size; /* flash page size we assume */ +- unsigned unused[2]; /* future expansion: should be 0 */ +- ++ unsigned dt_size; /* device tree in bytes */ ++ unsigned unused; /* future expansion: should be 0 */ + unsigned char name[BOOT_NAME_SIZE]; /* asciiz product name */ + + unsigned char cmdline[BOOT_ARGS_SIZE]; +@@ -64,10 +64,13 @@ struct boot_img_hdr + ** +-----------------+ + ** | second stage | o pages + ** +-----------------+ ++** | device tree | p pages ++** +-----------------+ + ** + ** n = (kernel_size + page_size - 1) / page_size + ** m = (ramdisk_size + page_size - 1) / page_size + ** o = (second_size + page_size - 1) / page_size ++** p = (dt_size + page_size - 1) / page_size + ** + ** 0. all entities are page_size aligned in flash + ** 1. kernel and ramdisk are required (size != 0) +--- a/system/core/mkbootimg/mkbootimg.c ++++ b/system/core/mkbootimg/mkbootimg.c +@@ -65,6 +65,7 @@ int usage(void) + " [ --board <boardname> ]\n" + " [ --base <address> ]\n" + " [ --pagesize <pagesize> ]\n" ++ " [ --dt <filename> ]\n" + " -o|--output <filename>\n" + ); + return 1; +@@ -105,6 +106,8 @@ int main(int argc, char **argv) + char *cmdline = ""; + char *bootimg = 0; + char *board = ""; ++ char *dt_fn = 0; ++ void *dt_data = 0; + unsigned pagesize = 2048; + int fd; + SHA_CTX ctx; +@@ -158,6 +161,8 @@ int main(int argc, char **argv) + fprintf(stderr,"error: unsupported page size %d\n", pagesize); + return -1; + } ++ } else if(!strcmp(arg, "--dt")) { ++ dt_fn = val; + } else { + return usage(); + } +@@ -232,6 +237,14 @@ int main(int argc, char **argv) + } + } + ++ if(dt_fn) { ++ dt_data = load_file(dt_fn, &hdr.dt_size); ++ if (dt_data == 0) { ++ fprintf(stderr,"error: could not load device tree image '%s'\n", dt_fn); ++ return 1; ++ } ++ } ++ + /* put a hash of the contents in the header so boot images can be + * differentiated based on their first 2k. + */ +@@ -242,6 +255,10 @@ int main(int argc, char **argv) + SHA_update(&ctx, &hdr.ramdisk_size, sizeof(hdr.ramdisk_size)); + SHA_update(&ctx, second_data, hdr.second_size); + SHA_update(&ctx, &hdr.second_size, sizeof(hdr.second_size)); ++ if(dt_data) { ++ SHA_update(&ctx, dt_data, hdr.dt_size); ++ SHA_update(&ctx, &hdr.dt_size, sizeof(hdr.dt_size)); ++ } + sha = SHA_final(&ctx); + memcpy(hdr.id, sha, + SHA_DIGEST_SIZE > sizeof(hdr.id) ? sizeof(hdr.id) : SHA_DIGEST_SIZE); +@@ -266,6 +283,10 @@ int main(int argc, char **argv) + if(write_padding(fd, pagesize, hdr.second_size)) goto fail; + } + ++ if(dt_data) { ++ if(write(fd, dt_data, hdr.dt_size) != (ssize_t) hdr.dt_size) goto fail; ++ if(write_padding(fd, pagesize, hdr.dt_size)) goto fail; ++ } + return 0; + + fail: diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk new file mode 100644 index 000000000..519f609fd --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk @@ -0,0 +1,29 @@ +# Makefile for mkbootimg + +SRCDIR ?= $(S) + +VPATH += $(SRCDIR)/system/core/mkbootimg +mkbootimg_SRC_FILES += mkbootimg.c +mkbootimg_OBJS := $(mkbootimg_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libmincrypt +libmincrypt_SRC_FILES := dsa_sig.c p256.c p256_ec.c p256_ecdsa.c rsa.c sha.c sha256.c +libmincrypt_OBJS := $(libmincrypt_SRC_FILES:.c=.o) + +CFLAGS += -DANDROID +CFLAGS += -I$(SRCDIR)/system/core/mkbootimg +CFLAGS += -I$(SRCDIR)/system/core/include +CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h + +LIBS += libmincrypt.a + +all: mkbootimg + +mkbootimg: libmincrypt.a $(mkbootimg_OBJS) + $(CC) -o $@ $(LDFLAGS) $(mkbootimg_OBJS) $(LIBS) + +libmincrypt.a: $(libmincrypt_OBJS) + $(AR) rcs $@ $(libmincrypt_OBJS) + +clean: + $(RM) $(mkbootimg_OBJS) $(libmincrypt_OBJS) mkbootimg *.a diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch new file mode 100644 index 000000000..85af81f0f --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch @@ -0,0 +1,72 @@ +Description: add -o argument to preserve ownership +Author: Markus Mayer <mmayer@mmayer.net> + +See also https://android-review.googlesource.com/#/c/100312/ + +Upstream-Status: Inappropriate +--- + system/extras/ext4_utils/make_ext4fs.c | 6 ++++++ + system/extras/ext4_utils/make_ext4fs_main.c | 10 ++++++++-- + 2 files changed, 14 insertions(+), 2 deletions(-) + +--- a/system/extras/ext4_utils/make_ext4fs_main.c ++++ b/system/extras/ext4_utils/make_ext4fs_main.c +@@ -49,13 +49,15 @@ extern struct fs_info info; + + extern struct selabel_handle* selinux_android_file_context_handle(void); + ++extern int preserve_owner; ++ + static void usage(char *path) + { + fprintf(stderr, "%s [ -l <len> ] [ -j <journal size> ] [ -b <block_size> ]\n", basename(path)); + fprintf(stderr, " [ -g <blocks per group> ] [ -i <inodes> ] [ -I <inode size> ]\n"); + fprintf(stderr, " [ -L <label> ] [ -f ] [ -a <android mountpoint> ]\n"); + fprintf(stderr, " [ -S file_contexts ] [ -C fs_config ] [ -T timestamp ]\n"); +- fprintf(stderr, " [ -z | -s ] [ -w ] [ -c ] [ -J ] [ -v ] [ -B <block_list_file> ]\n"); ++ fprintf(stderr, " [ -z | -s ] [ -w ] [ -c ] [ -J ] [ -o ] [ -v ] [ -B <block_list_file> ]\n"); + fprintf(stderr, " <filename> [<directory>]\n"); + } + +@@ -81,7 +83,7 @@ int main(int argc, char **argv) + struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "" } }; + #endif + +- while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:S:T:C:B:fwzJsctv")) != -1) { ++ while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:S:T:C:B:fwzJsctov")) != -1) { + switch (opt) { + case 'l': + info.len = parse_num(optarg); +@@ -144,6 +146,10 @@ int main(int argc, char **argv) + } + #endif + break; ++ case 'o': ++ preserve_owner = 1; ++ printf("Warning: Enabling 'preserve ownership', this is an unofficial feature!\n"); ++ break; + case 'v': + verbose = 1; + break; +--- a/system/extras/ext4_utils/make_ext4fs.c ++++ b/system/extras/ext4_utils/make_ext4fs.c +@@ -67,6 +67,8 @@ + + #endif + ++int preserve_owner = 0; ++ + /* TODO: Not implemented: + Allocating blocks in the same block group as the file inode + Hash or binary tree directories +@@ -185,6 +187,10 @@ static u32 build_directory_structure(con + } else { + dentries[i].mtime = fixed_time; + } ++ if (preserve_owner) { ++ dentries[i].uid = stat.st_uid; ++ dentries[i].gid = stat.st_gid; ++ } + uint64_t capabilities; + if (fs_config_func != NULL) { + #ifdef ANDROID diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-bionic-android.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-bionic-android.patch new file mode 100644 index 000000000..e933724cf --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-bionic-android.patch @@ -0,0 +1,67 @@ +Description: remove bionic specific calls +Author: Fathi Boudra <fabo@debian.org> + +Upstream-Status: Inappropriate +--- + system/core/include/cutils/properties.h | 1 - + system/core/libcutils/properties.c | 2 +- + system/core/liblog/logd_write.c | 5 +++++ + 3 files changed, 6 insertions(+), 2 deletions(-) + +--- a/system/core/include/cutils/properties.h ++++ b/system/core/include/cutils/properties.h +@@ -19,7 +19,6 @@ + + #include <sys/cdefs.h> + #include <stddef.h> +-#include <sys/system_properties.h> + #include <stdint.h> + + #ifdef __cplusplus +--- a/system/core/liblog/logd_write.c ++++ b/system/core/liblog/logd_write.c +@@ -23,6 +23,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/stat.h> ++#include <sys/syscall.h> + #include <sys/types.h> + #if (FAKE_LOG_DEVICE == 0) + #include <sys/socket.h> +@@ -205,7 +206,11 @@ static int __write_to_log_kernel(log_id_ + realtime_ts.tv_nsec = ts.tv_nsec; + + log_id_buf = log_id; ++#ifdef __BIONIC__ + tid = gettid(); ++#else ++ tid = (pid_t) syscall(__NR_gettid); ++#endif + + newVec[0].iov_base = (unsigned char *) &log_id_buf; + newVec[0].iov_len = sizeof_log_id_t; +--- a/system/core/libcutils/properties.c ++++ b/system/core/libcutils/properties.c +@@ -104,10 +104,10 @@ int32_t property_get_int32(const char *k + return (int32_t)property_get_imax(key, INT32_MIN, INT32_MAX, default_value); + } + ++#undef HAVE_LIBC_SYSTEM_PROPERTIES + #ifdef HAVE_LIBC_SYSTEM_PROPERTIES + + #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ +-#include <sys/_system_properties.h> + + int property_set(const char *key, const char *value) + { +--- a/external/libselinux/src/procattr.c ++++ b/external/libselinux/src/procattr.c +@@ -8,7 +8,7 @@ + #include "selinux_internal.h" + #include "policy.h" + +-#ifdef HOST ++#ifndef __BIONIC__ + static pid_t gettid(void) + { + return syscall(__NR_gettid); diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-selinux-android.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-selinux-android.patch new file mode 100644 index 000000000..d4a37f82b --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-selinux-android.patch @@ -0,0 +1,56 @@ +Subject: drop useless includes of Android SELINUX extensions; avoids having to clone another module; this should be sent upstream +Author: Sergio Schvezov <sergio.schvezov@canonical.com> + +Upstream-Status: Inappropriate +--- + system/core/adb/file_sync_service.c | 3 --- + system/extras/ext4_utils/make_ext4fs.c | 1 - + system/extras/ext4_utils/make_ext4fs_main.c | 1 - + 3 files changed, 5 deletions(-) + +--- a/system/extras/ext4_utils/make_ext4fs.c ++++ b/system/extras/ext4_utils/make_ext4fs.c +@@ -62,7 +62,6 @@ + + #include <selinux/selinux.h> + #include <selinux/label.h> +-#include <selinux/android.h> + + #define O_BINARY 0 + +--- a/system/extras/ext4_utils/make_ext4fs_main.c ++++ b/system/extras/ext4_utils/make_ext4fs_main.c +@@ -32,7 +32,6 @@ + #ifndef USE_MINGW + #include <selinux/selinux.h> + #include <selinux/label.h> +-#include <selinux/android.h> + #else + struct selabel_handle; + #endif +--- a/system/core/adb/file_sync_service.c ++++ b/system/core/adb/file_sync_service.c +@@ -26,7 +26,6 @@ + + #include <errno.h> + #include <private/android_filesystem_config.h> +-#include <selinux/android.h> + #include "sysdeps.h" + + #define TRACE_TAG TRACE_SYNC +@@ -73,7 +72,6 @@ static int mkdirs(char *name) + *x = '/'; + return ret; + } +- selinux_android_restorecon(name, 0); + } + *x++ = '/'; + } +@@ -251,7 +249,6 @@ static int handle_send_file(int s, char + if(fd >= 0) { + struct utimbuf u; + adb_close(fd); +- selinux_android_restorecon(path, 0); + u.actime = timestamp; + u.modtime = timestamp; + utime(path, &u); diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-capability.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-capability.patch new file mode 100644 index 000000000..b8ebe09dc --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-capability.patch @@ -0,0 +1,19 @@ +Subject: use linux/capability.h on linux systems too +Author: Loïc Minier <loic.minier@ubuntu.com> + +Upstream-Status: Inappropriate +--- + system/core/include/private/android_filesystem_config.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/system/core/include/private/android_filesystem_config.h ++++ b/system/core/include/private/android_filesystem_config.h +@@ -27,7 +27,7 @@ + #include <sys/types.h> + #include <stdint.h> + +-#ifdef HAVE_ANDROID_OS ++#if defined(HAVE_ANDROID_OS) || defined(__linux__) + #include <linux/capability.h> + #else + #include "android_filesystem_capability.h" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch new file mode 100644 index 000000000..7facd61b9 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch @@ -0,0 +1,62 @@ +Subject: adb: Use local sockets where appropriate +Author: Hilko Bengen <bengen@debian.org> + +Upstream-Status: Inappropriate +--- + system/core/adb/adb.c | 6 +++++- + system/core/adb/adb_client.c | 5 +++-- + system/core/adb/transport_local.c | 3 ++- + 3 files changed, 10 insertions(+), 4 deletions(-) + +--- a/system/core/adb/adb.c ++++ b/system/core/adb/adb.c +@@ -1230,7 +1230,11 @@ int launch_server(int server_port) + */ + void build_local_name(char* target_str, size_t target_size, int server_port) + { +- snprintf(target_str, target_size, "tcp:%d", server_port); ++ if (gListenAll > 0) { ++ snprintf(target_str, target_size, "tcp:%d", server_port); ++ } else { ++ snprintf(target_str, target_size, "local:%d", server_port); ++ } + } + + #if !ADB_HOST +--- a/system/core/adb/adb_client.c ++++ b/system/core/adb/adb_client.c +@@ -185,12 +185,12 @@ int _adb_connect(const char *service) + strcpy(__adb_error, "service name too long"); + return -1; + } +- snprintf(tmp, sizeof tmp, "%04x", len); ++ snprintf(tmp, sizeof tmp, "%d", __adb_server_port); + + if (__adb_server_name) + fd = socket_network_client(__adb_server_name, __adb_server_port, SOCK_STREAM); + else +- fd = socket_loopback_client(__adb_server_port, SOCK_STREAM); ++ fd = socket_local_client(tmp, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM); + + if(fd < 0) { + strcpy(__adb_error, "cannot connect to daemon"); +@@ -201,6 +201,7 @@ int _adb_connect(const char *service) + return -1; + } + ++ snprintf(tmp, sizeof tmp, "%04x", len); + if(writex(fd, tmp, 4) || writex(fd, service, len)) { + strcpy(__adb_error, "write failure during connection"); + adb_close(fd); +--- a/system/core/adb/transport_local.c ++++ b/system/core/adb/transport_local.c +@@ -121,7 +121,8 @@ int local_connect_arbitrary_ports(int co + } + #endif + if (fd < 0) { +- fd = socket_loopback_client(adb_port, SOCK_STREAM); ++ snprintf(buf, sizeof buf, "%d", adb_port); ++ fd = socket_local_client(buf, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM); + } + + if (fd >= 0) { diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb new file mode 100644 index 000000000..a9e7d5d82 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -0,0 +1,163 @@ +DESCRIPTION = "Different utilities from Android" +SECTION = "console/utils" +LICENSE = "Apache-2.0 & GPL-2.0 & BSD-2-Clause & BSD-3-Clause" +LIC_FILES_CHKSUM = " \ + file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ + file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=8bef8e6712b1be5aa76af1ebde9d6378 \ + file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ +" +DEPENDS = "libbsd libpcre openssl zlib" + +ANDROID_TAG = "android-5.1.1_r37" +ANDROID_MIRROR = "android.googlesource.com" +CORE_REPO = "${ANDROID_MIRROR}/platform/system/core" +EXTRAS_REPO = "${ANDROID_MIRROR}/platform/system/extras" +LIBHARDWARE_REPO = "${ANDROID_MIRROR}/platform/hardware/libhardware" +LIBSELINUX_REPO = "${ANDROID_MIRROR}/platform/external/libselinux" +BUILD_REPO = "${ANDROID_MIRROR}/platform/build" + +SRC_URI = " \ + git://${CORE_REPO};name=core;protocol=https;nobranch=1;destsuffix=git/system/core;tag=${ANDROID_TAG} \ + git://${EXTRAS_REPO};name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras;tag=${ANDROID_TAG} \ + git://${LIBHARDWARE_REPO};name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware;tag=${ANDROID_TAG} \ + git://${LIBSELINUX_REPO};name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux;tag=${ANDROID_TAG} \ + git://${BUILD_REPO};name=build;protocol=https;nobranch=1;destsuffix=git/build;tag=${ANDROID_TAG} \ + file://remove-selinux-android.patch;apply=yes \ + file://use-capability.patch;apply=yes \ + file://use-local-socket.patch;apply=yes \ + file://preserve-ownership.patch;apply=yes \ + file://mkbootimg-Add-dt-parameter-to-specify-DT-image.patch;apply=yes \ + file://remove-bionic-android.patch;apply=yes \ + file://define-shell-command.patch;apply=yes \ + file://implicit-declaration-function-strlcat-strlcopy.patch;apply=yes \ + file://android-tools-adbd.service \ + file://.gitignore;subdir=git \ + file://adb.mk;subdir=${BPN} \ + file://adbd.mk;subdir=${BPN} \ + file://ext4_utils.mk;subdir=${BPN} \ + file://fastboot.mk;subdir=${BPN} \ + file://mkbootimg.mk;subdir=${BPN} \ +" + +S = "${WORKDIR}/git" +B = "${WORKDIR}/${BPN}" + +inherit systemd + +SYSTEMD_SERVICE_${PN} = "android-tools-adbd.service" + +# Get rid of files uneeded to build Android tools +do_unpack_extra() { + cd ${S} + rm -rf \ + system/core/.git \ + system/extras/.git \ + hardware/libhardware/.git \ + external/libselinux/.git \ + build/.git + git init + git add . + git commit -m \ + "Initial import - committed ${ANDROID_TAG}" + git clean -fdx +} + +addtask unpack_extra after do_unpack before do_patch + +# Find libbsd headers during native builds +CC_append_class-native = " -I${STAGING_INCDIR}" +CC_append_class-nativesdk = " -I${STAGING_INCDIR}" + +TOOLS = "adb fastboot ext4_utils mkbootimg adbd" + +# Adb needs sys/capability.h, which is not available for native* +TOOLS_class-native = "fastboot ext4_utils mkbootimg" +TOOLS_class-nativesdk = "fastboot ext4_utils mkbootimg" + +do_compile() { + # Setting both variables below causing our makefiles to not work with + # implicit make rules + unset CFLAGS + unset CPPFLAGS + + export SRCDIR=${S} + + case "${HOST_ARCH}" in + arm) + export android_arch=linux-arm + ;; + aarch64) + export android_arch=linux-arm64 + ;; + mips|mipsel) + export android_arch=linux-mips + ;; + powerpc|powerpc64) + export android_arch=linux-ppc + ;; + i586|x86_64) + export android_arch=linux-x86 + ;; + esac + + for tool in ${TOOLS}; do + mkdir -p ${B}/${tool} + oe_runmake -f ${B}/${tool}.mk -C ${B}/${tool} + done +} + +do_install() { + if echo ${TOOLS} | grep -q "ext4_utils" ; then + install -D -p -m0755 ${S}/system/core/libsparse/simg_dump.py ${D}${bindir}/simg_dump + install -D -p -m0755 ${S}/system/extras/ext4_utils/mkuserimg.sh ${D}${bindir}/mkuserimg + + install -m0755 ${B}/ext4_utils/ext2simg ${D}${bindir} + install -m0755 ${B}/ext4_utils/ext4fixup ${D}${bindir} + install -m0755 ${B}/ext4_utils/img2simg ${D}${bindir} + install -m0755 ${B}/ext4_utils/make_ext4fs ${D}${bindir} + install -m0755 ${B}/ext4_utils/simg2img ${D}${bindir} + install -m0755 ${B}/ext4_utils/simg2simg ${D}${bindir} + fi + + if echo ${TOOLS} | grep -q "adb " ; then + install -d ${D}${bindir} + install -m0755 ${B}/adb/adb ${D}${bindir} + fi + + if echo ${TOOLS} | grep -q "adbd" ; then + install -d ${D}${bindir} + install -m0755 ${B}/adbd/adbd ${D}${bindir} + fi + + # Outside the if statement to avoid errors during do_package + install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \ + ${D}${systemd_unitdir}/system/android-tools-adbd.service + + if echo ${TOOLS} | grep -q "fastboot" ; then + install -d ${D}${bindir} + install -m0755 ${B}/fastboot/fastboot ${D}${bindir} + fi + + if echo ${TOOLS} | grep -q "mkbootimg" ; then + install -d ${D}${bindir} + install -m0755 ${B}/mkbootimg/mkbootimg ${D}${bindir} + fi +} + +PACKAGES += "${PN}-fstools" + +RDEPENDS_${BPN} = "${BPN}-conf bash" + +FILES_${PN}-fstools = "\ + ${bindir}/ext2simg \ + ${bindir}/ext4fixup \ + ${bindir}/img2simg \ + ${bindir}/make_ext4fs \ + ${bindir}/simg2img \ + ${bindir}/simg2simg \ + ${bindir}/simg_dump \ + ${bindir}/mkuserimg \ +" + +BBCLASSEXTEND += "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_svn.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_svn.bb index 7ada3a3b2..b573ea502 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_svn.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_svn.bb @@ -17,6 +17,8 @@ SRCREV = "r1435" SRC_URI = "svn://google-breakpad.googlecode.com/svn;module=trunk;protocol=http" S = "${WORKDIR}/trunk" +COMPATIBLE_MACHINE_powerpc = "(!.*ppc).*" + do_install_append() { install -d ${D}${includedir} install -d ${D}${includedir}/breakpad diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb index 87e524dd7..6940d2da4 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb @@ -101,7 +101,7 @@ do_install () { install -m 0755 -d ${D}${sysconfdir}/avahi/services/ install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/ - + install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system } diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb index 51243c237..19767c311 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb @@ -10,7 +10,7 @@ SECTION = "base" PV = "0.5.1+git${SRCPV}" SRCREV = "f97d3da5c375ac2fc5a9173cdd36cb828915a2e1" LIC_FILES_CHKSUM = "file://LICENSE;md5=a0b24c1a8f9ad516a297d055b0294231" -SRC_URI = "git://github.com/concurrencykit/ck.git;protocol=https \ +SRC_URI = "git://github.com/concurrencykit/ck.git \ file://cross.patch \ " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb new file mode 100644 index 000000000..781287a90 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb @@ -0,0 +1,263 @@ +DESCRIPTION = "A fast and lightweight IDE" +HOMEPAGE = "http://plugins.geany.org/" + +LICENSE_DEFAULT = "GPLv2" +LICENSE = "${LICENSE_DEFAULT} & BSD-2-Clause & GPLv3" + +python () { + for plugin in d.getVar('PLUGINS', True).split(): + if 'LICENSE_%s' % plugin not in d: + d.setVar('LICENSE_' + plugin, '${LICENSE_DEFAULT}') +} + +DEPENDS = " \ + geany \ + libxml2 \ + libsoup-2.4 \ + enchant \ + intltool-native \ + libassuan \ + gpgme \ + vte9 \ + libgit2 \ +" + +inherit autotools pkgconfig gtk-icon-cache + +SRC_URI = "http://plugins.geany.org/${PN}/${PN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "54ad042b6f91ff8e7a497c22faa2db4b" +SRC_URI[sha256sum] = "b13471e0a4cb76d04a96bb21c965087b50c16390edee0c6b3bbd920d8ac17745" + +do_configure_prepend() { + rm -f ${S}/build/cache/glib-gettext.m4 +} + +FILES_${PN} += "${datadir}/icons" +FILES_${PN}-dev += "${libdir}/geany/*.la ${libdir}/${PN}/*/*.la" + +PLUGINS += "${PN}-addons" +LIC_FILES_CHKSUM += "file://addons/COPYING;md5=4325afd396febcb659c36b49533135d4" +FILES_${PN}-addons = "${libdir}/geany/addons.so" +RDEPENDS_${PN}-addons = "${PN}" + +PLUGINS += "${PN}-autoclose" +LIC_FILES_CHKSUM += "file://autoclose/COPYING;md5=751419260aa954499f7abaabaa882bbe" +FILES_${PN}-autoclose = "${libdir}/geany/autoclose.so" +RDEPENDS_${PN}-autoclose = "${PN}" + +PLUGINS += "${PN}-automark" +LIC_FILES_CHKSUM += "file://automark/COPYING;md5=751419260aa954499f7abaabaa882bbe" +FILES_${PN}-automark = "${libdir}/geany/automark.so" +RDEPENDS_${PN}-automark = "${PN}" + +PLUGINS += "${PN}-codenav" +LIC_FILES_CHKSUM += "file://codenav/COPYING;md5=751419260aa954499f7abaabaa882bbe" +FILES_${PN}-codenav = "${libdir}/geany/codenav.so" +RDEPENDS_${PN}-codenav = "${PN}" + +PLUGINS += "${PN}-commander" +LIC_FILES_CHKSUM += "file://commander/COPYING;md5=d32239bcb673463ab874e80d47fae504" +LICENSE_${PN}-commander = "GPLv3" +FILES_${PN}-commander = "${libdir}/geany/commander.so" +RDEPENDS_${PN}-commander = "${PN}" + +PLUGINS += "${PN}-debugger" +LIC_FILES_CHKSUM += "file://debugger/COPYING;md5=4325afd396febcb659c36b49533135d4" +FILES_${PN}-debugger = "${libdir}/geany/debugger.so ${datadir}/${PN}/debugger" +RDEPENDS_${PN}-debugger = "${PN}" + +PLUGINS += "${PN}-defineformat" +LIC_FILES_CHKSUM += "file://defineformat/COPYING;md5=751419260aa954499f7abaabaa882bbe" +FILES_${PN}-defineformat = "${libdir}/geany/defineformat.so" +RDEPENDS_${PN}-defineformat = "${PN}" + +# no gnome devhelp in some common layer +EXTRA_OECONF += "--disable-devhelp" +#PLUGINS += "${PN}-devhelp" +#LIC_FILES_CHKSUM += "file://devhelp/COPYING;md5=d32239bcb673463ab874e80d47fae504" +#LICENSE_${PN}-devhelp = "GPLv3" +#FILES_${PN}-devhelp = "${libdir}/geany/devhelp.so" +#RDEPENDS_${PN}-devhelp = "${PN}" + +PLUGINS += "${PN}-geanyctags" +LIC_FILES_CHKSUM += "file://geanyctags/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-geanyctags = "${libdir}/geany/geanyctags.so" +RDEPENDS_${PN}-geanyctags = "${PN}" + +PLUGINS += "${PN}-geanydoc" +LIC_FILES_CHKSUM += "file://geanydoc/COPYING;md5=d32239bcb673463ab874e80d47fae504" +LICENSE_${PN}-geanydoc = "GPLv3" +FILES_${PN}-geanydoc = "${libdir}/geany/geanydoc.so" +RDEPENDS_${PN}-geanydoc = "${PN}" + +PLUGINS += "${PN}-geanyextrasel" +LIC_FILES_CHKSUM += "file://geanyextrasel/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-geanyextrasel = "${libdir}/geany/geanyextrasel.so" +RDEPENDS_${PN}-geanyextrasel = "${PN}" + +PLUGINS += "${PN}-geanyinsertnum" +LIC_FILES_CHKSUM += "file://geanyinsertnum/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-geanyinsertnum = "${libdir}/geany/geanyinsertnum.so" +RDEPENDS_${PN}-geanyinsertnum = "${PN}" + +PLUGINS += "${PN}-geanylatex" +LIC_FILES_CHKSUM += "file://geanylatex/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-geanylatex = "${libdir}/geany/geanylatex.so" +RDEPENDS_${PN}-geanylatex = "${PN}" + +PLUGINS += "${PN}-geanylipsum" +LIC_FILES_CHKSUM += "file://geanylipsum/COPYING;md5=4325afd396febcb659c36b49533135d4" +FILES_${PN}-geanylipsum = "${libdir}/geany/geanylipsum.so" +RDEPENDS_${PN}-geanylipsum = "${PN}" + +# no lua: max supported version is 5.2 +EXTRA_OECONF += "--disable-geanylua" +#PLUGINS += "${PN}-geanylua" +#LIC_FILES_CHKSUM += "file://geanylua/COPYING;md5=4325afd396febcb659c36b49533135d4" +#FILES_${PN}-geanylua = "${libdir}/geany/geanylua.so ${libdir}/${PN}/geanylua/*.so" +#RDEPENDS_${PN}-geanylua = "${PN}" + +PLUGINS += "${PN}-geanymacro" +LIC_FILES_CHKSUM += "file://geanymacro/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-geanymacro = "${libdir}/geany/geanymacro.so" +RDEPENDS_${PN}-geanymacro = "${PN}" + +PLUGINS += "${PN}-geanyminiscript" +LIC_FILES_CHKSUM += "file://geanyminiscript/COPYING;md5=4325afd396febcb659c36b49533135d4" +FILES_${PN}-geanyminiscript = "${libdir}/geany/geanyminiscript.so" +RDEPENDS_${PN}-geanyminiscript = "${PN}" + +PLUGINS += "${PN}-geanynumberedbookmarks" +LIC_FILES_CHKSUM += "file://geanynumberedbookmarks/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-geanynumberedbookmarks = "${libdir}/geany/geanynumberedbookmarks.so" +RDEPENDS_${PN}-geanynumberedbookmarks = "${PN}" + +PLUGINS += "${PN}-geanypg" +LIC_FILES_CHKSUM += "file://geanypg/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +FILES_${PN}-geanypg = "${libdir}/geany/geanypg.so" +RDEPENDS_${PN}-geanypg = "${PN}" + +PLUGINS += "${PN}-geanyprj" +LIC_FILES_CHKSUM += "file://geanyprj/COPYING;md5=d32239bcb673463ab874e80d47fae504" +LICENSE_${PN}-geanyprj = "GPLv3" +FILES_${PN}-geanyprj = "${libdir}/geany/geanyprj.so" +RDEPENDS_${PN}-geanyprj = "${PN}" + +# no gnome pygtk +EXTRA_OECONF += "--disable-geanypy" +#PLUGINS += "${PN}-geanypy" +#LIC_FILES_CHKSUM += "file://geanypy/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +#FILES_${PN}-geanypy = "${libdir}/geany/geanypy.so" +#RDEPENDS_${PN}-geanypy = "${PN}" + +PLUGINS += "${PN}-geanyvc" +LIC_FILES_CHKSUM += "file://geanyvc/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-geanyvc = "${libdir}/geany/geanyvc.so" +RDEPENDS_${PN}-geanyvc = "${PN}" + +PLUGINS += "${PN}-geniuspaste" +LIC_FILES_CHKSUM += "file://geniuspaste/COPYING;md5=bfc203269f8862ebfc1198cdc809a95a" +FILES_${PN}-geniuspaste = "${libdir}/geany/geniuspaste.so ${datadir}/${PN}/geniuspaste" +RDEPENDS_${PN}-geniuspaste = "${PN}" + +PLUGINS += "${PN}-git-changebar" +LIC_FILES_CHKSUM += "file://git-changebar/COPYING;md5=d32239bcb673463ab874e80d47fae504" +LICENSE_${PN}-git-changebar = "GPLv3" +FILES_${PN}-git-changebar = "${libdir}/geany/git-changebar.so" +RDEPENDS_${PN}-git-changebar = "${PN}" + +PLUGINS += "${PN}-lineoperations" +LIC_FILES_CHKSUM += "file://lineoperations/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-lineoperations = "${libdir}/geany/lineoperations.so" +RDEPENDS_${PN}-lineoperations = "${PN}" + +# no markdown - avoid floating dependencies +EXTRA_OECONF += " --disable-peg-markdown" +#PLUGINS += "${PN}-markdown" +#LIC_FILES_CHKSUM += "file://markdown/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +#FILES_${PN}-markdown = "${libdir}/geany/markdown.so" +#RDEPENDS_${PN}-markdown = "${PN}" + +PLUGINS += "${PN}-multiterm" +LIC_FILES_CHKSUM += "file://multiterm/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +FILES_${PN}-multiterm = "${libdir}/geany/multiterm.so" +RDEPENDS_${PN}-multiterm = "${PN}" + +PLUGINS += "${PN}-overview" +LIC_FILES_CHKSUM += "file://overview/overview/overviewplugin.c;beginline=4;endline=20;md5=1aa33522916cdeb46cccac0c629da0d0" +FILES_${PN}-overview = "${libdir}/geany/overview.so ${datadir}/${PN}/overview" +RDEPENDS_${PN}-overview = "${PN}" + +PLUGINS += "${PN}-pairtaghighlighter" +LICENSE_${PN}-pairtaghighlighter = "BSD-2-Clause" +LIC_FILES_CHKSUM += "file://pairtaghighlighter/COPYING;md5=d6d927525a612b3a8dbebc4b2e9b47c1" +FILES_${PN}-pairtaghighlighter = "${libdir}/geany/pairtaghighlighter.so" +RDEPENDS_${PN}-pairtaghighlighter = "${PN}" + +PLUGINS += "${PN}-pohelper" +LICENSE_${PN}-pohelper = "GPLv3" +LIC_FILES_CHKSUM += "file://pohelper/COPYING;md5=d32239bcb673463ab874e80d47fae504" +FILES_${PN}-pohelper = "${libdir}/geany/pohelper.so" +RDEPENDS_${PN}-pohelper = "${PN}" + +PLUGINS += "${PN}-pretty-printer" +LIC_FILES_CHKSUM += "file://pretty-printer/src/PrettyPrinter.c;beginline=1;endline=17;md5=1665115c2fadb17c1b53cdb4e43b2440" +FILES_${PN}-pretty-printer = "${libdir}/geany/pretty-printer.so" +RDEPENDS_${PN}-pretty-printer = "${PN}" + +PLUGINS += "${PN}-projectorganizer" +LIC_FILES_CHKSUM += "file://projectorganizer/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-projectorganizer = "${libdir}/geany/projectorganizer.so" +RDEPENDS_${PN}-projectorganizer = "${PN}" + +PLUGINS += "${PN}-scope" +LIC_FILES_CHKSUM += "file://scope/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-scope = "${libdir}/geany/scope.so" +RDEPENDS_${PN}-scope = "${PN}" + +PLUGINS += "${PN}-sendmail" +LIC_FILES_CHKSUM += "file://sendmail/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-sendmail = "${libdir}/geany/sendmail.so" +RDEPENDS_${PN}-sendmail = "${PN}" + +PLUGINS += "${PN}-shiftcolumn" +LIC_FILES_CHKSUM += "file://shiftcolumn/COPYING;md5=751419260aa954499f7abaabaa882bbe" +FILES_${PN}-shiftcolumn = "${libdir}/geany/shiftcolumn.so" +RDEPENDS_${PN}-shiftcolumn = "${PN}" + +PLUGINS += "${PN}-spellcheck" +LIC_FILES_CHKSUM += "file://spellcheck/COPYING;md5=4325afd396febcb659c36b49533135d4" +FILES_${PN}-spellcheck = "${libdir}/geany/spellcheck.so" +RDEPENDS_${PN}-spellcheck = "${PN}" + +PLUGINS += "${PN}-tableconvert" +LIC_FILES_CHKSUM += "file://tableconvert/COPYING;md5=6753686878d090a1f3f9445661d3dfbc" +FILES_${PN}-tableconvert = "${libdir}/geany/tableconvert.so" +RDEPENDS_${PN}-tableconvert = "${PN}" + +PLUGINS += "${PN}-treebrowser" +LIC_FILES_CHKSUM += "file://treebrowser/README;beginline=67;endline=67;md5=52f90857fd1a9672111e472dd056a0d8" +FILES_${PN}-treebrowser = "${libdir}/geany/treebrowser.so" +RDEPENDS_${PN}-treebrowser = "${PN}" + +PLUGINS += "${PN}-updatechecker" +LIC_FILES_CHKSUM += "file://updatechecker/COPYING;md5=4325afd396febcb659c36b49533135d4" +FILES_${PN}-updatechecker = "${libdir}/geany/updatechecker.so" +RDEPENDS_${PN}-updatechecker = "${PN}" + +# no webkit - lasts ages and is not properly detected +EXTRA_OECONF += " --disable-webhelper" +#PLUGINS += "${PN}-webhelper" +#LIC_FILES_CHKSUM += "file://webhelper/COPYING;md5=d32239bcb673463ab874e80d47fae504" +#LICENSE_${PN}-webhelper = "GPLv3" +#FILES_${PN}-webhelper = "${libdir}/geany/webhelper.so" +#RDEPENDS_${PN}-webhelper = "${PN}" + +PLUGINS += "${PN}-xmlsnippets" +LIC_FILES_CHKSUM += "file://xmlsnippets/COPYING;md5=4325afd396febcb659c36b49533135d4" +FILES_${PN}-xmlsnippets = "${libdir}/geany/xmlsnippets.so" +RDEPENDS_${PN}-xmlsnippets = "${PN}" + +PACKAGES =+ "${PLUGINS}" +RDEPENDS_${PN} = "${PLUGINS}" +ALLOW_EMPTY_${PN} = "1" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.26.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.28.bb index ca4f6b63d..da97090a4 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.26.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.28.bb @@ -2,7 +2,7 @@ SUMMARY = "A fast and lightweight IDE" HOMEPAGE = "http://www.geany.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5" -DEPENDS = "gtk+ python-docutils-native" +DEPENDS = "gtk+ python3-docutils-native" inherit autotools pkgconfig perlnative pythonnative @@ -10,7 +10,9 @@ SRC_URI = " \ http://download.geany.org/${BP}.tar.bz2 \ file://0001-configure.ac-remove-additional-c-test.patch \ " -SRC_URI[md5sum] = "bd457caba57099cfa23b063e78b6f819" -SRC_URI[sha256sum] = "e38530e87c577e1e9806be3b40e08fb9ee321eb1abc6361ddacdad89c825f90d" +SRC_URI[md5sum] = "39a29deb598e9e3503ee7d9d5fb51a34" +SRC_URI[sha256sum] = "f73a3708f1a26e9bf72da564d5037d6f7fedca2e0d6175db0681c2b672100a5a" FILES_${PN} += "${datadir}/icons" + +EXTRA_OECONF = "--disable-html-docs" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_4.1.6.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb index e59d0e517..21fa352cd 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_4.1.6.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb @@ -2,14 +2,11 @@ SUMMARY = "shared library for GIF images" SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a" -PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2" inherit autotools -EXTRA_OECONF = "--disable-x11" - PACKAGES += "${PN}-utils" FILES_${PN} = "${libdir}/libgif.so.*" FILES_${PN}-utils = "${bindir}" @@ -18,5 +15,5 @@ BBCLASSEXTEND = "native" RDEPENDS_${PN}-utils = "perl" -SRC_URI[md5sum] = "7125644155ae6ad33dbc9fc15a14735f" -SRC_URI[sha256sum] = "e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed" +SRC_URI[md5sum] = "2c171ced93c0e83bb09e6ccad8e3ba2b" +SRC_URI[sha256sum] = "df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/files/0002-fix-gcc-6-build.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/files/0002-fix-gcc-6-build.patch new file mode 100644 index 000000000..f735ff819 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/files/0002-fix-gcc-6-build.patch @@ -0,0 +1,39 @@ +From 5aa3d2abb905fa8594f6c6572a87809da54c9342 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Mon, 5 Sep 2016 11:25:27 +0200 +Subject: [PATCH] fix gcc-6 build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + gladeui/glade-editor-property.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c +index a0c1039..5e9ac38 100644 +--- a/gladeui/glade-editor-property.c ++++ b/gladeui/glade-editor-property.c +@@ -2703,6 +2703,8 @@ glade_eprop_object_view (gboolean radio) + } + + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + static gchar * + glade_eprop_object_dialog_title (GladeEditorProperty *eprop) + { +@@ -2731,6 +2733,7 @@ glade_eprop_object_dialog_title (GladeEditorProperty *eprop) + return g_strdup_printf (format, g_type_name + (eprop->klass->pspec->value_type)); + } ++#pragma GCC diagnostic pop + + + gboolean +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb index 4e7ef9b5c..fd655366f 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb @@ -4,12 +4,15 @@ LICENSE = "GPLv2 & LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "gtk+ gnome-doc-utils-native gnome-common libxml2" +DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native" -inherit autotools pkgconfig pythonnative +inherit autotools pkgconfig pythonnative gtk-icon-cache -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \ - file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch" +SRC_URI = " \ + http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \ + file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \ + file://0002-fix-gcc-6-build.patch \ +" SRC_URI[md5sum] = "4e4b4f5ee34a03e017e4cef97d796c1f" SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735" @@ -18,10 +21,4 @@ EXTRA_OECONF += "--disable-scrollkeeper" PACKAGECONFIG ??= "" PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui" -do_configure_prepend() { - sed -i '/^if HAVE_GNOME_DOC_UTILS/,/^endif/d' ${S}/Makefile.am -} - FILES_${PN} += "${datadir}/icons" -FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug" -FILES_${PN}-dev += "${libdir}/glade3/modules/*.la" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb index 25e60013d..e7a406fc5 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb @@ -20,7 +20,11 @@ RDEPENDS_${PN} = "ncurses" EXTRA_OEMAKE = "-e MAKEFLAGS=" do_compile() { - oe_runmake -C src all + oe_runmake -C src all +} + +do_install_append() { + rm -r ${D}/${localstatedir}/run } do_install() { @@ -29,7 +33,7 @@ do_install() { TARGET=${D}${bindir} \ WORKDIR=${D}${localstatedir}/local/iptraf \ LOGDIR=${D}${localstatedir}/log/iptraf \ - LOCKDIR=${D}${localstatedir}/run/iptraf + LOCKDIR=${D}${localstatedir}/run/iptraf } FILES_${PN} += "${bindir} ${localstatedir} /run" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jq/jq/Support-without-oniguruma.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/jq/jq/Support-without-oniguruma.patch new file mode 100644 index 000000000..1dfd955f0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/jq/jq/Support-without-oniguruma.patch @@ -0,0 +1,68 @@ +From 18b4b18b41f5ed396d73449ce8d6ec408d95d6b2 Mon Sep 17 00:00:00 2001 +From: David Tolnay <dtolnay@gmail.com> +Date: Sat, 21 Nov 2015 10:05:37 -0800 +Subject: [PATCH] Support --without-oniguruma + +Upstream-Status: Backport + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> + +--- + configure.ac | 41 ++++++++++++++++++++--------------------- + 1 file changed, 20 insertions(+), 21 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9e2c8cf..7f6be34 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,27 +52,26 @@ fi + AC_ARG_WITH([oniguruma], + [AS_HELP_STRING([--with-oniguruma=prefix], + [try this for a non-standard install prefix of the oniguruma library])], +- [ONIGURUMAPATHSET=1], +- [ONIGURUMAPATHSET=0]) +- +-if test $ONIGURUMAPATHSET = 1; then +- CFLAGS="$CFLAGS -I${with_oniguruma}/include" +- LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib" +-fi +- +-# check for ONIGURUMA library +-HAVE_ONIGURUMA=0 +-AC_CHECK_HEADER("oniguruma.h", +- AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; HAVE_ONIGURUMA=1;])) +- +-# handle check results +-if test $HAVE_ONIGURUMA != 1; then +- AC_MSG_NOTICE([Oniguruma was not found.]) +- AC_MSG_NOTICE([ Try setting the location using '--with-oniguruma=PREFIX' ]) +-else +- AC_DEFINE([HAVE_ONIGURUMA],1,[Define to 1 if Oniguruma is installed]) +-fi +- ++ [], ++ [with_oniguruma=yes]) ++ ++AS_IF([test "x$with_oniguruma" != xno], [ ++ AS_IF([test "x$with_oniguruma" != xyes], [ ++ CFLAGS="$CFLAGS -I${with_oniguruma}/include" ++ LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib" ++ ]) ++ # check for ONIGURUMA library ++ have_oniguruma=0 ++ AC_CHECK_HEADER("oniguruma.h", ++ AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; have_oniguruma=1;])) ++ # handle check results ++ AS_IF([test $have_oniguruma = 1], [ ++ AC_DEFINE([HAVE_ONIGURUMA], 1, [Define to 1 if Oniguruma is installed]) ++ ], [ ++ AC_MSG_NOTICE([Oniguruma was not found.]) ++ AC_MSG_NOTICE([Try setting the location using '--with-oniguruma=PREFIX']) ++ ]) ++]) + + dnl Check for valgrind + AC_CHECK_PROGS(valgrind_cmd, valgrind) +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.5.bb index 612eaf396..0f40815cc 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.5.bb @@ -2,16 +2,14 @@ SUMMARY = "Lightweight and flexible command-line JSON processor" DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \ filter and map and transform structured data with the same \ ease that sed, awk, grep and friends let you play with text." -HOMEPAGE = "http://stedolan.github.io/jq/" +HOMEPAGE = "https://stedolan.github.io/jq/" BUGTRACKER = "https://github.com/stedolan/jq/issues" SECTION = "utils" - LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=29dd0c35d7e391bb8d515eacf7592e00" -DEPENDS = "flex-native bison-native onig" - -SRC_URI = "https://github.com/stedolan/${BPN}/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ +SRC_URI = "https://github.com/stedolan/${BPN}/releases/download/${BP}/${BP}.tar.gz \ + file://Support-without-oniguruma.patch \ " SRC_URI[md5sum] = "0933532b086bd8b6a41c1b162b1731f9" @@ -19,5 +17,14 @@ SRC_URI[sha256sum] = "c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe inherit autotools -# Don't build documentation (generation requires ruby) -EXTRA_OECONF = "--disable-docs --disable-maintainer-mode" +PACKAGECONFIG ?= "oniguruma" + +PACKAGECONFIG[docs] = "--enable-docs,--disable-docs,ruby-native" +PACKAGECONFIG[maintainer-mode] = "--enable-maintainer-mode,--disable-maintainer-mode,flex-native bison-native" +PACKAGECONFIG[oniguruma] = "--with-oniguruma,--without-oniguruma,onig" + +OE_EXTRACONF += " \ + --disable-valgrind \ +" + +BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libedit/libedit_20150325-3.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/libedit/libedit_20160618-3.1.bb index 4a72896ce..bda421d81 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libedit/libedit_20150325-3.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/libedit/libedit_20160618-3.1.bb @@ -16,5 +16,5 @@ SRC_URI = "http://www.thrysoee.dk/editline/${BPN}-${PV}.tar.gz" S = "${WORKDIR}/${BPN}-${PV}" -SRC_URI[md5sum] = "43cdb5df3061d78b5e9d59109871b4f6" -SRC_URI[sha256sum] = "c88a5e4af83c5f40dda8455886ac98923a9c33125699742603a88a0253fcc8c5" +SRC_URI[md5sum] = "b6e60f326a3fce91bea1a6fe4700af58" +SRC_URI[sha256sum] = "b6b159c0c6ec8a7f349ea2a75d8b960efa346c462c1ac4921f1ac0de85a9f5d6" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libfribidi/fribidi_0.19.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/libfribidi/fribidi_0.19.2.bb deleted file mode 100644 index cb4bc24a8..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libfribidi/fribidi_0.19.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Fribidi library for bidirectional text" -SECTION = "libs" -PR = "r1" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -BBCLASSEXTEND = "native" - -PROVIDES = "libfribidi" - -inherit autotools lib_package pkgconfig - -CFLAGS_append = " -DPAGE_SIZE=4096 " - -SRC_URI = "http://fribidi.org/download/fribidi-${PV}.tar.gz" - -SRC_URI[md5sum] = "626db17d2d99b43615ad9d12500f568a" -SRC_URI[sha256sum] = "49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libfribidi/fribidi_0.19.7.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/libfribidi/fribidi_0.19.7.bb new file mode 100644 index 000000000..e79de6643 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/libfribidi/fribidi_0.19.7.bb @@ -0,0 +1,18 @@ +SUMMARY = "Fribidi library for bidirectional text" +SECTION = "libs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" +BBCLASSEXTEND = "native" + +PROVIDES = "libfribidi" +DEPENDS = "glib-2.0 libpcre" + +inherit autotools lib_package pkgconfig + +CFLAGS_append = " -DPAGE_SIZE=4096 " +SECURITY_CFLAGS_remove_toolchain-clang = "-D_FORTIFY_SOURCE=2" + +SRC_URI = "http://fribidi.org/download/fribidi-${PV}.tar.bz2" + +SRC_URI[md5sum] = "6c7e7cfdd39c908f7ac619351c1c5c23" +SRC_URI[sha256sum] = "08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ltrace-fix-gcc-5-logical-not-parentheses.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ltrace-fix-gcc-5-logical-not-parentheses.patch deleted file mode 100644 index 681c43da0..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ltrace-fix-gcc-5-logical-not-parentheses.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 876fe5680d77800426f8c4c5680a235732d722e6 Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Mon, 24 Aug 2015 17:37:54 +0800 -Subject: [PATCH] ltrace: fix gcc 5 logical not parentheses - -Upstream-Status: Pending - -Build ltrace with gcc 5.2, it fails with: - -error: logical not is only applied to the left hand side of comparison -[-Werror=logical-not-parentheses] - if (!need_data(data, offset, SIZE / 8) < 0) \ - ^ - -Function need_data just return 0 on success and -1 if fail. So it is ok -to just test if (need_data(data, offset, SIZE / 8) < 0). - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - ltrace-elf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ltrace-elf.c b/ltrace-elf.c -index c571d2a..7fe830f 100644 ---- a/ltrace-elf.c -+++ b/ltrace-elf.c -@@ -218,7 +218,7 @@ need_data(Elf_Data *data, GElf_Xword offset, GElf_Xword size) - int \ - NAME(Elf_Data *data, GElf_Xword offset, uint##SIZE##_t *retp) \ - { \ -- if (!need_data(data, offset, SIZE / 8) < 0) \ -+ if (need_data(data, offset, SIZE / 8) < 0) \ - return -1; \ - \ - if (data->d_buf == NULL) /* NODATA section */ { \ --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch new file mode 100644 index 000000000..65c7d535e --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch @@ -0,0 +1,36 @@ +From 64f98f84fd88797e219f9dde1ca387fee4b509f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 24 Apr 2016 16:58:17 -0700 +Subject: [PATCH] replace readdir_r with readdir + +glibc 2.24 has deprecated readdir_r + +https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + sysdeps/linux-gnu/proc.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c +index 953fd86..edb716d 100644 +--- a/sysdeps/linux-gnu/proc.c ++++ b/sysdeps/linux-gnu/proc.c +@@ -242,9 +242,10 @@ process_tasks(pid_t pid, pid_t **ret_tasks, size_t *ret_n) + size_t alloc = 0; + + while (1) { +- struct dirent entry; + struct dirent *result; +- if (readdir_r(d, &entry, &result) != 0) { ++ errno = 0; ++ result = readdir(d); ++ if (errno != 0) { + fail: + free(tasks); + closedir(d); +-- +2.8.0 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/ltrace-0.7.2-unused-typedef.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/ltrace-0.7.2-unused-typedef.patch deleted file mode 100644 index 8f3c0ecea..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/ltrace-0.7.2-unused-typedef.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/value.c b/value.c -index d18db17..b98298e 100644 ---- a/value.c -+++ b/value.c -@@ -1,6 +1,6 @@ - /* - * This file is part of ltrace. -- * Copyright (C) 2011,2012 Petr Machata, Red Hat Inc. -+ * Copyright (C) 2011,2012,2013 Petr Machata, Red Hat Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as -@@ -282,9 +282,9 @@ value_init_deref(struct value *ret_val, struct value *valp) - if (value_extract_word(valp, &l, NULL) < 0) - return -1; - -- /* We need "long" to be long enough to hold platform -+ /* We need "long" to be long enough to hold target - * pointers. */ -- typedef char assert__long_enough_long[-(sizeof(l) < sizeof(void *))]; -+ assert(sizeof(l) >= sizeof(arch_addr_t)); - - value_common_init(ret_val, valp->inferior, valp, - valp->type->u.ptr_info.info, 0); -diff --git a/lens_default.c b/lens_default.c -index ed3d0e1..5d00814 100644 ---- a/lens_default.c -+++ b/lens_default.c -@@ -1,6 +1,6 @@ - /* - * This file is part of ltrace. -- * Copyright (C) 2011,2012 Petr Machata, Red Hat Inc. -+ * Copyright (C) 2011,2012,2013 Petr Machata, Red Hat Inc. - * Copyright (C) 1998,2004,2007,2008,2009 Juan Cespedes - * Copyright (C) 2006 Ian Wienand - * Copyright (C) 2006 Steve Fink -@@ -342,9 +342,9 @@ format_array(FILE *stream, struct value *value, struct value_dict *arguments, - struct expr_node *length, size_t maxlen, int before, - const char *open, const char *close, const char *delim) - { -- /* We need "long" to be long enough to cover the whole address -- * space. */ -- typedef char assert__long_enough_long[-(sizeof(long) < sizeof(void *))]; -+ /* We need "long" to be long enough to cover the whole target -+ * address space. */ -+ assert(sizeof(long) >= sizeof(arch_addr_t)); - long l; - if (expr_eval_word(length, value, arguments, &l) < 0) - return -1; diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index bc4e27166..8ae018503 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -11,14 +11,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" PE = "1" PV = "7.3+git${SRCPV}" -SRCREV = "37ecc41b58be3dbdd79592a76e331b5b371e4f81" +SRCREV = "01b10e191e99d8cb147e5a2b7da8196e0ec6fb94" DEPENDS = "elfutils" RDEPENDS_${PN} = "elfutils" -SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=ltrace-0.7 \ - file://ltrace-0.7.2-unused-typedef.patch \ +SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=master \ file://configure-allow-to-disable-selinux-support.patch \ - file://0001-ltrace-fix-gcc-5-logical-not-parentheses.patch \ + file://0001-replace-readdir_r-with-readdir.patch \ " S = "${WORKDIR}/git" @@ -29,5 +28,5 @@ PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" do_configure_prepend () { - ( cd ${S}; ./autogen.sh ) + ( cd ${S}; ./autogen.sh ) } diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.3.bb index 07a1a433c..b7995c298 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.2.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.3.bb @@ -1,11 +1,9 @@ DESCRIPTION = "Lua is a powerful light-weight programming language designed \ for extending applications." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=318;endline=352;md5=68fc2aa2b751a37ff265524ddf026d7f" +LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=318;endline=352;md5=10ffd57d574c60d5b4d6189544e205a9" HOMEPAGE = "http://www.lua.org/" -PR = "r0" - DEPENDS = "readline" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ file://lua.pc.in \ @@ -15,10 +13,10 @@ SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', \ file://run-ptest \ ', '', d)}" -SRC_URI[tarballsrc.md5sum] = "33278c2ab5ee3c1a875be8d55c1ca2a1" -SRC_URI[tarballsrc.sha256sum] = "c740c7bb23a936944e1cc63b7c3c5351a8976d7867c5252c8854f7b2af9da68f" -SRC_URI[tarballtest.md5sum] = "a2b7ab1b8ff82a0145376e233ef30a4a" -SRC_URI[tarballtest.sha256sum] = "56909863a3713dee3709b3dbd0c868237e4f5c9ea1744f5bf0ba8bafa6c4ed32" +SRC_URI[tarballsrc.md5sum] = "703f75caa4fdf4a911c1a72e67a27498" +SRC_URI[tarballsrc.sha256sum] = "5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2" +SRC_URI[tarballtest.md5sum] = "76f4fb07f2a4970d554645ac26df86df" +SRC_URI[tarballtest.sha256sum] = "13154abc20976196119db531b4169ce1ce511755879d40b4192e4173291287e5" inherit pkgconfig binconfig ptest diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb index a0252aa94..964dc1d59 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb @@ -15,11 +15,6 @@ inherit pkgconfig binconfig BBCLASSEXTEND = "native" -do_configure_prepend() { - sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile - sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile -} - # http://luajit.org/install.html#cross # Host luajit needs to be compiled with the same pointer size # If you want to cross-compile to any 32 bit target on an x64 OS, @@ -30,20 +25,52 @@ BUILD_CC_ARCH_append_powerpc = ' -m32' BUILD_CC_ARCH_append_x86 = ' -m32' BUILD_CC_ARCH_append_arm = ' -m32' -EXTRA_OEMAKE_append_class-target = '\ - CROSS=${HOST_PREFIX} \ - HOST_CC="${BUILD_CC} ${BUILD_CC_ARCH}" \ - TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${TARGET_CC_ARCH}" \ - TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \ - TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}" \ -' +# The lua makefiles expect the TARGET_SYS to be from uname -s +# Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD +LUA_TARGET_OS = "Unknown" +LUA_TARGET_OS_darwin = "Darwin" +LUA_TARGET_OS_linux = "Linux" +LUA_TARGET_OS_linux-gnueabi = "Linux" +LUA_TARGET_OS_mingw32 = "Windows" + +# We don't want the lua buildsystem's compiler optimizations, or its +# stripping, and we don't want it to pick up CFLAGS or LDFLAGS, as those apply +# to both host and target compiles +EXTRA_OEMAKE = "\ + Q= E='@:' \ + \ + CCOPT= CCOPT_x86= CFLAGS= LDFLAGS= TARGET_STRIP='@:' \ + \ + 'TARGET_SYS=${LUA_TARGET_OS}' \ + \ + 'CC=${CC}' \ + 'TARGET_AR=${AR} rcus' \ + 'TARGET_CFLAGS=${CFLAGS}' \ + 'TARGET_LDFLAGS=${LDFLAGS}' \ + 'TARGET_SHLDFLAGS=${LDFLAGS}' \ + 'HOST_CC=${BUILD_CC}' \ + 'HOST_CFLAGS=${BUILD_CFLAGS}' \ + 'HOST_LDFLAGS=${BUILD_LDFLAGS}' \ + \ + 'PREFIX=${prefix}' \ + 'MULTILIB=${baselib}' \ +" do_compile () { oe_runmake } +# There's INSTALL_LIB and INSTALL_SHARE also, but the lua binary hardcodes the +# '/share' and '/' + LUA_MULTILIB paths, so we don't want to break those +# expectations. +EXTRA_OEMAKEINST = "\ + 'DESTDIR=${D}' \ + 'INSTALL_BIN=${D}${bindir}' \ + 'INSTALL_INC=${D}${includedir}/luajit-$(MAJVER).$(MINVER)' \ + 'INSTALL_MAN=${D}${mandir}/man1' \ +" do_install () { - oe_runmake 'DESTDIR=${D}' install + oe_runmake ${EXTRA_OEMAKEINST} install rmdir ${D}${datadir}/lua/5.* \ ${D}${datadir}/lua \ ${D}${libdir}/lua/5.* \ @@ -52,6 +79,9 @@ do_install () { PACKAGES += 'luajit-common' +# See the comment for EXTRA_OEMAKEINST. This is needed to ensure the hardcoded +# paths are packaged regardless of what the libdir and datadir paths are. +FILES_${PN} += "${prefix}/${baselib} ${prefix}/share" FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \ ${libdir}/libluajit-5.1.so.${PV} \ " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial-native_3.4.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial-native_3.8.4.bb index 303a032fb..0526fc220 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial-native_3.4.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial-native_3.8.4.bb @@ -5,16 +5,16 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "python-native" -SRC_URI = "http://mercurial.selenic.com/release/mercurial-${PV}.tar.gz" -SRC_URI[md5sum] = "65783a60aefb46a11296b587e9403537" -SRC_URI[sha256sum] = "7a8acf7329beda38ceea29c689212574d9a6bfffe24cf565015ea0066f7cee3f" +SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" +SRC_URI[md5sum] = "cec2c3db688cb87142809089c6ae13e9" +SRC_URI[sha256sum] = "4b2e3ef19d34fa1d781cb7425506a05d4b6b1172bab69d6ea78874175fdf3da6" S = "${WORKDIR}/mercurial-${PV}" inherit native EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} PREFIX=${prefix}" + PREFIX=${prefix}" do_configure_append () { sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb deleted file mode 100644 index 7d009068d..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Message Passing Interface (MPI) implementation" -HOMEPAGE = "http://www.mpich.org/" -SECTION = "devel" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2106f0435056f3dd9349747a766e5816" - -SRC_URI = " \ - http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "40dc408b1e03cc36d80209baaa2d32b7" -SRC_URI[sha256sum] = "455ccfaf4ec724d2cf5d8bff1f3d26a958ad196121e7ea26504fd3018757652d" - -CACHED_CONFIGUREVARS += "BASH_SHELL=${base_bindir}/bash" - -RDEPENDS_${PN} += "bash perl libxml2" -S = "${WORKDIR}/${BP}" - -EXTRA_OECONF = "--enable-debuginfo \ - --enable-fast \ - --enable-shared \ - --with-pm=gforker \ - --disable-rpath \ - --disable-f77 \ - --disable-fc \ - --disable-fortran \ - --disable-cxx" - -inherit autotools-brokensep gettext - -do_configure_prepend() { - autoreconf --verbose --install --force -I . -I confdb/ -I maint/ - oe_runconf - exit -} - -# http://errors.yoctoproject.org/Errors/Details/35146/ -PNBLACKLIST[mpich] ?= "BROKEN: QA Issue: libmpi.la failed sanity test (workdir), QA Issue: mpich.pc failed sanity test (tmpdir)" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.2.bb new file mode 100644 index 000000000..4537a66e0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.2.bb @@ -0,0 +1,42 @@ +SUMMARY = "Message Passing Interface (MPI) implementation" +HOMEPAGE = "http://www.mpich.org/" +SECTION = "devel" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2106f0435056f3dd9349747a766e5816" + +SRC_URI = " \ + http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz \ +" + +SRC_URI[md5sum] = "f414cfa77099cd1fa1a5ae4e22db508a" +SRC_URI[sha256sum] = "0778679a6b693d7b7caff37ff9d2856dc2bfc51318bf8373859bfa74253da3dc" + +CACHED_CONFIGUREVARS += "BASH_SHELL=${base_bindir}/bash" + +RDEPENDS_${PN} += "bash perl libxml2" +S = "${WORKDIR}/${BP}" + +EXTRA_OECONF = "--enable-debuginfo \ + --enable-fast \ + --enable-shared \ + --with-pm=gforker \ + --disable-rpath \ + --disable-f77 \ + --disable-fc \ + --disable-fortran \ + --disable-cxx \ +" + +inherit autotools-brokensep gettext + +do_configure_prepend() { + autoreconf --verbose --install --force -I . -I confdb/ -I maint/ + oe_runconf + exit +} + +do_install_append() { + sed -i 's,${S}/,,g' ${D}/${libdir}/libmpi.la + sed -i 's,${DEBUG_PREFIX_MAP},,g' ${D}/${libdir}/pkgconfig/mpich.pc +} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ninja/ninja-native_1.6.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/ninja/ninja_1.7.1.bb index c00710afd..2a4b82917 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ninja/ninja-native_1.6.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/ninja/ninja_1.7.1.bb @@ -3,23 +3,28 @@ HOMEPAGE = "http://martine.github.com/ninja/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" -DEPENDS = "re2c-native" +DEPENDS = "re2c-native ninja-native" -inherit native - -SRCREV="484c16336f19bd8970bb6e75322d61b92a229899" +SRCREV = "b49b0fc01bb052b6ac856b1e72be9391e962398e" SRC_URI = "git://github.com/martine/ninja.git;branch=release" -S="${WORKDIR}/git" +S = "${WORKDIR}/git" do_configure[noexec] = "1" +do_compile_class-native() { + ./configure.py --bootstrap +} + do_compile() { - python ${S}/configure.py --bootstrap + ./configure.py + ninja } do_install() { install -d ${D}${bindir} install -m 0755 ${S}/ninja ${D}${bindir}/ } + +BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_4.4.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb index 43761aeac..03e981249 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_4.4.3.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb @@ -1,9 +1,9 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & BSD & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=96aa1ac122c41f8c08a0683d4b2126b5" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8e3c01094f0fcb889b13f0354e52f914" -DEPENDS = "openssl" +DEPENDS = "openssl zlib" COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" @@ -12,8 +12,8 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://no-registry.patch \ " -SRC_URI[md5sum] = "74e83c9c512bd99b38a02edd740b4334" -SRC_URI[sha256sum] = "57499bb0b1b86080459d4066e3c138579a278b2d0b1f5b2f19e66c69b4e8433c" +SRC_URI[md5sum] = "4f70295e3eebef1f998fa38456263eaf" +SRC_URI[sha256sum] = "fe2a85df8758001878abb5bbaf17a6b6cdc12b3e465b1d3bace83b37fdf0345a" S = "${WORKDIR}/node-v${PV}" @@ -30,7 +30,11 @@ def map_nodejs_arch(a, d): elif re.match('powerpc$', a): return 'ppc' return a -ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)}" +ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ + ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ + '--with-arm-fpu=vfp', d), d), d)}" GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " ARCHFLAGS ?= "" @@ -39,7 +43,7 @@ do_configure () { export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings - ./configure --prefix=${prefix} --without-snapshot --shared-openssl \ + ./configure --prefix=${prefix} --without-snapshot --shared-openssl --shared-zlib \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH', True), d)}" \ --dest-os=linux \ ${ARCHFLAGS} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.036.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.036.bb new file mode 100644 index 000000000..f5dbef2af --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.036.bb @@ -0,0 +1,25 @@ +SUMMARY = "A Perl DBI driver for MySQL" +DESCRIPTION = "DBD::mysql is the Perl5 Database Interface driver for \ +the MySQL database. In other words: DBD::mysql is an interface between \ +the Perl programming language and the MySQL programming API that comes \ +with the MySQL relational database management system. Most functions \ +provided by this programming API are supported. Some rarely used \ +functions are missing, mainly because no-one ever requested them. \ +" +HOMEPAGE = "http://search.cpan.org/~michielb/DBD-mysql-4.036/lib/DBD/mysql.pm" + +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" +DEPENDS += "libdbi-perl-native libmysqlclient" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/DBD-mysql-${PV}.tar.gz \ +" + +SRC_URI[md5sum] = "fdee1d8dc4ae54bc6cb7cd5a3f3d3342" +SRC_URI[sha256sum] = "5c48a823f86b8110ccb6504c6176ca248b52f56829dd4548bc39c3509f4154cf" + +S = "${WORKDIR}/DBD-mysql-${PV}" + +inherit cpan diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.636.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.636.bb new file mode 100644 index 000000000..085b90493 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.636.bb @@ -0,0 +1,26 @@ +SUMMARY = "The Perl Database Interface" +DESCRIPTION = "DBI is a database access Application Programming Interface \ +(API) for the Perl Language. The DBI API Specification defines a set \ +of functions, variables and conventions that provide a consistent \ +database interface independent of the actual database being used. \ +" +HOMEPAGE = "http://search.cpan.org/dist/DBI/" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" +RDEPENDS_${PN} = " perl-module-carp \ + perl-module-exporter \ + perl-module-exporter-heavy \ + perl-module-dynaloader \ +" + +LIC_FILES_CHKSUM = "file://DBI.pm;beginline=8147;endline=8151;md5=2e5f6cf47e5ad7b77dcb6172edc29292" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz" +SRC_URI[md5sum] = "60f291e5f015550dde71d1858dfe93ba" +SRC_URI[sha256sum] = "8f7ddce97c04b4b7a000e65e5d05f679c964d62c8b02c94c1a7d815bb2dd676c" + +S = "${WORKDIR}/DBI-${PV}" + +inherit cpan + +BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php-5.6.26/change-AC_TRY_RUN-to-AC_TRY_LINK.patch index 39c334f39..39c334f39 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php-5.6.26/change-AC_TRY_RUN-to-AC_TRY_LINK.patch diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc index ee7a14334..cd919403e 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc @@ -15,7 +15,7 @@ SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \ " -SRC_URI_append_class-target += " \ +SRC_URI_append_class-target = " \ file://iconv.patch \ file://imap-fix-autofoo.patch \ file://pear-makefile.patch \ @@ -70,7 +70,9 @@ EXTRA_OECONF_class-native = " \ " PACKAGECONFIG ??= "mysql sqlite3 imap \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG_class-native = "" PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \ @@ -91,6 +93,7 @@ PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ --with-imap-ssl=${STAGING_DIR_HOST} \ ,--without-imap --without-imap-ssl \ ,uw-imap" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" @@ -120,8 +123,8 @@ do_install_append_class-native() { } do_install_prepend() { - cat aclocal-copy/libtool.m4 aclocal-copy/lt~obsolete.m4 aclocal-copy/ltoptions.m4 \ - aclocal-copy/ltsugar.m4 aclocal-copy/ltversion.m4 > ${S}/build/libtool.m4 + cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \ + ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4 } do_install_prepend_class-target() { diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.5.32.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.5.32.bb deleted file mode 100644 index 4ee3c3830..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.5.32.bb +++ /dev/null @@ -1,6 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=464ca70af214d2407f6b7d4458158afd" - -SRC_URI[md5sum] = "47443f39152d671d24bc839e6a49049d" -SRC_URI[sha256sum] = "b0f2c108db8e05db9f6366aaba9a754fd0ee31f3f86ee889561b608dfd6e92ee" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.5.38.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.5.38.bb new file mode 100644 index 000000000..26f35b1c1 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.5.38.bb @@ -0,0 +1,6 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=464ca70af214d2407f6b7d4458158afd" + +SRC_URI[md5sum] = "312244a0eecad602a1555ed2434e223f" +SRC_URI[sha256sum] = "473c81ebb2e48ca468caee031762266651843d7227c18a824add9b07b9393e38" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.18.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.26.bb index 2ce012f1b..cbd0615d6 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.18.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.26.bb @@ -3,5 +3,5 @@ require php.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=b602636d46a61c0ac0432bbf5c078fe4" SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch" -SRC_URI[md5sum] = "7340353bedd998286ba2c4d87d7864f8" -SRC_URI[sha256sum] = "c3cd4a29a9562309d36e2b128407d6eaa5c7dde590d2b1a464457383e517f4ed" +SRC_URI[md5sum] = "cb424b705cfb715fc04f499f8a8cf52e" +SRC_URI[sha256sum] = "d47aab8083a4284b905777e1b45dd7735adc53be827b29f896684750ac8b6236" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb index 22ed8e2ff..94fc736b5 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb @@ -1,5 +1,5 @@ DESCRIPTION = "This is a small collection of power management \ - test and investigation tools" + test and investigation tools" HOMEPAGE = "http://lesswatts.org/projects/acpi" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" @@ -17,13 +17,13 @@ S = "${WORKDIR}/git" do_configure[noexec] = "1" do_compile() { - oe_runmake + oe_runmake } do_install() { - install -d ${D}${bindir} ${D}${docdir} - install -m 755 ${S}/acpidump/acpidump ${D}${bindir} - install -m 755 ${S}/acpixtract/acpixtract ${D}${bindir} - install -m 755 ${S}/madt/madt ${D}${bindir} - install -m 644 ${S}/README ${D}${docdir} + install -d ${D}${bindir} ${D}${docdir} + install -m 755 ${S}/acpidump/acpidump ${D}${bindir} + install -m 755 ${S}/acpixtract/acpixtract ${D}${bindir} + install -m 755 ${S}/madt/madt ${D}${bindir} + install -m 644 ${S}/README ${D}${docdir} } diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.2.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.2.1.bb new file mode 100644 index 000000000..40fb96cf4 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.2.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "Protocol Buffers - structured data serialisation mechanism" +DESCRIPTION = "This is protobuf-c, a C implementation of the Google Protocol Buffers data \ +serialization format. It includes libprotobuf-c, a pure C library that \ +implements protobuf encoding and decoding, and protoc-c, a code generator that \ +converts Protocol Buffer .proto files to C descriptor code, based on the \ +original protoc. protobuf-c formerly included an RPC implementation; that code \ +has been split out into the protobuf-c-rpc project." +HOMEPAGE = "https://github.com/protobuf-c/protobuf-c" +SECTION = "console/tools" +LICENSE = "BSD-2-Clause" + +DEPENDS = "protobuf-native protobuf" + +PACKAGE_BEFORE_PN = "${PN}-compiler" +RDEPENDS_${PN}-compiler = "protobuf-compiler" +RDEPENDS_${PN}-dev += "${PN}-compiler" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=235c3195a3968524dc1524b4ebea0c0e" +SRC_URI = "https://github.com/protobuf-c/protobuf-c/archive/v${PV}.tar.gz" + +SRC_URI[md5sum] = "b884aeba4283309445a8e3b6e7322dd6" +SRC_URI[sha256sum] = "2d708fb3c024b9e6e86df141faff802194f5db90a4b79e6d4aa6bd61dd983dd6" + +inherit autotools pkgconfig + +FILES_${PN}-compiler = "${bindir}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb index 049f9d4e8..2977c59c4 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb @@ -6,7 +6,11 @@ HOMEPAGE = "https://github.com/google/protobuf" SECTION = "console/tools" LICENSE = "BSD-3-Clause" +PACKAGE_BEFORE_PN = "${PN}-compiler" + DEPENDS = "zlib" +RDEPENDS_${PN}-compiler = "${PN}" +RDEPENDS_${PN}-dev += "${PN}-compiler" LIC_FILES_CHKSUM = "file://LICENSE;md5=af6809583bfde9a31595a58bb4a24514" @@ -22,4 +26,6 @@ inherit autotools S = "${WORKDIR}/git" +FILES_${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}" + BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb new file mode 100644 index 000000000..8f6532c53 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb @@ -0,0 +1,23 @@ +SUMMARY = "Cpuset is a Python application to make using the cpusets facilities in the Linux kernel easier" +SECTION = "devel/python" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRCNAME = "cpuset" + +SRC_URI = "https://github.com/lpechacek/${SRCNAME}/archive/v${PV}.tar.gz" + +SRC_URI[md5sum] = "6ad79b26ba03f559604d74513cc34392" +SRC_URI[sha256sum] = "32334e164415ed5aec83c5ffc3dc01c418406eb02d96d881fdfd495587ff0c01" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils + +RDEPENDS_${PN} = "\ + python-core \ + python-re \ + python-logging \ + python-textutils \ + python-unixadmin \ + " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch new file mode 100644 index 000000000..a391f7e74 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch @@ -0,0 +1,41 @@ +From 5e5350d730f85957a42c6d846d347d080e7dd996 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 23 Oct 2015 12:40:34 +0300 +Subject: [PATCH] configure.ac: add sysroot path to GI_DATADIR; don't set + introspection scanner and compiler paths + +Upstream-Status: Pending [review on oe-core maillist] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + configure.ac | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2c0cfbd..cfcb3bf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -194,7 +194,7 @@ PKG_CHECK_MODULES(GI, + gobject-introspection-1.0 >= introspection_required_version + ) + +-GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) ++GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) + AC_SUBST(GI_DATADIR) + + if test "$enable_cairo" != no; then +@@ -219,12 +219,6 @@ AC_ARG_WITH(common, + with_common=yes) + AM_CONDITIONAL(WITH_COMMON, test "$with_common" = "yes") + +-INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` +-INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` +- +-AC_SUBST(INTROSPECTION_SCANNER) +-AC_SUBST(INTROSPECTION_COMPILER) +- + # compiler warnings, errors, required cflags, and code coverage support + GNOME_COMPILE_WARNINGS([maximum]) + AC_MSG_CHECKING(for Gnome code coverage support) +-- +2.1.4 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.20.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.20.1.bb new file mode 100644 index 000000000..77416d45b --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.20.1.bb @@ -0,0 +1,34 @@ +SUMMARY = "Python GObject bindings" +SECTION = "devel/python" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" + +inherit autotools pkgconfig gnomebase distutils-base gobject-introspection + +PYTHON_BASEVERSION = "2.7" +PYTHON_PN = "python" + +DEPENDS += "python glib-2.0" + +SRCNAME="pygobject" +SRC_URI = " \ + http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ + file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \ +" + +SRC_URI[md5sum] = "4354c6283b135f859563b72457f6a321" +SRC_URI[sha256sum] = "3d261005d6fed6a92ac4c25f283792552f7dad865d1b7e0c03c2b84c04dbd745" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +BBCLASSEXTEND = "native" + +EXTRA_OECONF = "--disable-cairo --with-python=${PYTHON}" + +RDEPENDS_${PN} += "python-setuptools python-importlib" + +do_install_append() { + # Remove files that clash with python3-pygobject; their content is same + rm ${D}${includedir}/pygobject-3.0/pygobject.h ${D}${libdir}/pkgconfig/pygobject-3.0.pc +} + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-simplejson_3.8.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-simplejson_3.8.2.bb index a2a6c400f..0c9112e44 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-simplejson_3.8.2.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-simplejson_3.8.2.bb @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "d58439c548433adcda98e695be53e526ba940a4b9c44fb9a05d92cd495 S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit distutils +inherit setuptools RDEPENDS_${PN} = "\ python-core \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.1.bb index ab15a7e7f..3eadbe45f 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.1.bb @@ -1,12 +1,12 @@ SUMMARY = "Templatized C++ Command Line Parser" -HOMEPAGE = "http://tclap.sourceforge.net/" -LICENSE = "MIT" +HOMEPAGE = "http://tclap.sourceforge.net/" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c8ab0ff134bcc584d0e6b5b9f8732453" SRCREV = "3627d9402e529770df9b0edf2aa8c0e0d6c6bb41" SRC_URI = "git://git.code.sf.net/p/tclap/code \ file://Makefile.am-disable-docs.patch \ -" +" S = "${WORKDIR}/git" inherit autotools diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.4.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb index d8eca5008..59075bc6b 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.4.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb @@ -26,8 +26,8 @@ SRC_URI = "\ file://fix-xft.diff \ file://configure.use.fontconfig.with.xft.patch \ " -SRC_URI[md5sum] = "261754d7dc2a582f00e35547777e1fea" -SRC_URI[sha256sum] = "08f99df85e5dc9c4271762163c6aabb962c8b297dc5c4c1af8bdd05fc2dd26c1" +SRC_URI[md5sum] = "dd7dbb3a6523c42d05f6ab6e86096e99" +SRC_URI[sha256sum] = "d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d88eb19d" S = "${WORKDIR}/${BPN}${PV}/unix" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index 52b689ed6..402c42e41 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb @@ -20,7 +20,7 @@ S = "${WORKDIR}/imap-${PV}" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG[pam] = ",,libpam" -EXTRA_OEMAKE = "CC='${CC}'" +EXTRA_OEMAKE = "CC='${CC}' ARRC='${AR} -rc' RANLIB='${RANLIB}'" HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb index 2355c9dfc..b848b0693 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.3.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb @@ -10,8 +10,8 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "http://apache.lauf-forum.at/xerces/c/3/sources/${BP}.tar.bz2" -SRC_URI[md5sum] = "5e333b55cb43e6b025ddf0e5d0f0fb0d" -SRC_URI[sha256sum] = "fc5e5e0247b108b8d64d75aeb124cabdee9b7fcd725a89fe2242b4637b25c1fa" +SRC_URI[md5sum] = "d04ae9d8b2dee2157c6db95fa908abfd" +SRC_URI[sha256sum] = "9408f12c1628ecf80730bedbe8b2caad810edd01bb4c66f77b60c873e8cc6891" inherit autotools @@ -20,25 +20,26 @@ PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR},--with-curl=no,curl" PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR},--with-icu=no,icu" do_install_prepend () { - sed -i -e 's:-L${STAGING_DIR}/lib:-L\$\{libdir\}:g' ${B}/xerces-c.pc + sed -i -e 's:-L${STAGING_DIR}/lib:-L\$\{libdir\}:g' ${B}/xerces-c.pc } PACKAGES = "libxerces-c \ - libxerces-c-dbg \ - libxerces-c-dev \ - xerces-c-samples \ - xerces-c-samples-dbg \ - libxerces-c-staticdev \ - " + libxerces-c-dbg \ + libxerces-c-dev \ + xerces-c-samples \ + xerces-c-samples-dbg \ + libxerces-c-staticdev \ +" FILES_libxerces-c = "${libdir}/libxerces-c-3.1.so" -FILES_libxerces-c-dbg = "${libdir}/.debug \ - ${prefix}/src/debug " +FILES_libxerces-c-dbg = "${libdir}/.debug \ + ${prefix}/src/debug \ +" FILES_libxerces-c-dev = "${libdir}/lib*.la \ - ${libdir}/libxerces-c.so \ - ${libdir}/pkgconfig/xerces-c.pc \ - ${includedir}/xercesc \ - " + ${libdir}/libxerces-c.so \ + ${libdir}/pkgconfig/xerces-c.pc \ + ${includedir}/xercesc \ +" FILES_xerces-c-samples = "${bindir}/*" FILES_xerces-c-samples-dbg = "${bindir}/.debug/" FILES_libxerces-c-staticdev = "${libdir}/lib*.a" |
