From 041c04c837a8b60c965fbf66bac1e6e0c2583da6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 18 Mar 2014 07:54:09 +0100
Subject: fix initramfs generation, use KERNEL_MAKE_OPTS
---
mk/image.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mk/image.mk b/mk/image.mk
index bbe9d47ac..ff95c5cb0 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -224,8 +224,8 @@ ifeq ($(ADK_KERNEL_COMP_BZIP2),y)
echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config
endif
@-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null
- $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
- ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
+ env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \
+ -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package
mkdir -p ${TARGET_DIR}/boot/syslinux
--
cgit v1.2.3
From aa4604a4972871fbdf2767a8cd7fc81de4c70965 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 18 Mar 2014 08:47:36 +0100
Subject: fix compile with musl
---
package/sane-backends/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index 4bad787ef..52c36bf0c 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= sane-backends
PKG_VERSION:= 1.0.22
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= fadf56a60f4776bfb24491f66b617cf5
PKG_DESCR:= Scanner access now easy
PKG_SECTION:= misc
PKG_DEPENDS:= libpthread
-PKG_BUILDDEP:= libpthread libusb
+PKG_BUILDDEP:= libpthread libusb libusb-compat
PKG_URL:= http://www.sane-project.org/
PKG_SITES:= ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/
PKG_MULTI:= 1
@@ -165,6 +165,7 @@ $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX1220U,umax1220u))
$(eval $(call PKG_mod_template,SANE_BACKEND_UMAX_PP,umax_pp))
$(eval $(call PKG_mod_template,SANE_BACKEND_UMAX,umax))
+TARGET_CFLAGS+= -D_GNU_SOURCE
CONFIGURE_ENV+= ac_cv_func_ioperm=no have_libv4l1=no
CONFIGURE_ARGS+= --disable-translations \
--without-gphoto2 \
--
cgit v1.2.3