update buildroot to 2017.02.11
This commit is contained in:
jbnadal
@@ -0,0 +1,26 @@
|
||||
From 6bc1d15250841cf17d307cfb4f35c960c23d8797 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sun, 29 May 2016 19:31:50 +0200
|
||||
Subject: [PATCH] Remove man from BUILDDIRS in configure
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
config-scripts/cups-common.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
|
||||
index fbba715..77d0f5c 100644
|
||||
--- a/config-scripts/cups-common.m4
|
||||
+++ b/config-scripts/cups-common.m4
|
||||
@@ -446,7 +446,7 @@ AC_ARG_WITH(components, [ --with-components set components to build:
|
||||
|
||||
case "$COMPONENTS" in
|
||||
all)
|
||||
- BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
|
||||
+ BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale doc examples templates"
|
||||
;;
|
||||
|
||||
core)
|
||||
--
|
||||
2.8.1
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From 193c8d8c55a3478ca5c9e161ce581e5794098c6d Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Schonken <olivier.schonken@gmail.com>
|
||||
Date: Thu, 21 Jan 2016 23:04:49 +0100
|
||||
Subject: [PATCH] Do not use genstrings
|
||||
|
||||
Using cross compiled genstrings while cross-compiling will break
|
||||
compilation. Genstrings is still compiled because some power users
|
||||
might want to do ppd compilation on their target machine, and for that
|
||||
they would need to use the native compiled genstrings binary, to
|
||||
generate a sample.c file for their target
|
||||
|
||||
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
|
||||
[Thomas: completely remove call to genstrings rather than commenting
|
||||
it, remove useless and potentially confusing 'echo' before the
|
||||
genstrings call.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
ppdc/Makefile | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/ppdc/Makefile b/ppdc/Makefile
|
||||
index 68bf6b2..d57a0c9 100644
|
||||
--- a/ppdc/Makefile
|
||||
+++ b/ppdc/Makefile
|
||||
@@ -242,8 +242,6 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
|
||||
libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
|
||||
$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
|
||||
- echo Generating localization strings...
|
||||
- ./genstrings >sample.c
|
||||
|
||||
|
||||
#
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -0,0 +1,131 @@
|
||||
From e35f809c435c224954a5c7bff3f5729c5b3bc0ba Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 21 Jan 2016 23:21:06 +0100
|
||||
Subject: [PATCH] Sanitize the installation process
|
||||
|
||||
The installation process does two things that are not convenient when
|
||||
cross-compiling:
|
||||
|
||||
- It uses install's -s option to strip binaries, but this option uses
|
||||
the host strip and not the cross strip, which fails at stripping
|
||||
binaries. In addition, we do not necessarily want cups to strip its
|
||||
binaries, we may want to keep the debugging symbols.
|
||||
|
||||
- It enforces ownership (user, group) which isn't possible since
|
||||
"make install" isn't executed as root when cross-compiling.
|
||||
|
||||
- It installs many files and directories with permissions that
|
||||
prevent overwriting those files/directories, which meant calling
|
||||
"make install" twice was failing.
|
||||
|
||||
[Vincent: tweak the patch for 2.2.2 release]
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
---
|
||||
Makedefs.in | 12 ++++++------
|
||||
conf/Makefile | 6 +++---
|
||||
notifier/Makefile | 2 +-
|
||||
scheduler/Makefile | 15 +++++++--------
|
||||
4 files changed, 17 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/Makedefs.in b/Makedefs.in
|
||||
index 3afef0a..3e4f1bd 100644
|
||||
--- a/Makedefs.in
|
||||
+++ b/Makedefs.in
|
||||
@@ -40,14 +40,14 @@ SHELL = /bin/sh
|
||||
# Installation programs...
|
||||
#
|
||||
|
||||
-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
|
||||
-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
|
||||
+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755
|
||||
+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@
|
||||
INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
|
||||
-INSTALL_DATA = $(INSTALL) -c -m 444
|
||||
+INSTALL_DATA = $(INSTALL) -c -m 644
|
||||
INSTALL_DIR = $(INSTALL) -d
|
||||
-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
|
||||
-INSTALL_MAN = $(INSTALL) -c -m 444
|
||||
-INSTALL_SCRIPT = $(INSTALL) -c -m 555
|
||||
+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755
|
||||
+INSTALL_MAN = $(INSTALL) -c -m 644
|
||||
+INSTALL_SCRIPT = $(INSTALL) -c -m 755
|
||||
|
||||
#
|
||||
# Default user, group, and system groups for the scheduler...
|
||||
diff --git a/conf/Makefile b/conf/Makefile
|
||||
index 933d7d9..6ac5e19 100644
|
||||
--- a/conf/Makefile
|
||||
+++ b/conf/Makefile
|
||||
@@ -72,11 +72,11 @@ install: all install-data install-headers install-libs install-exec
|
||||
install-data:
|
||||
for file in $(KEEP); do \
|
||||
if test -r $(SERVERROOT)/$$file ; then \
|
||||
- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
|
||||
+ $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
|
||||
else \
|
||||
- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
|
||||
+ $(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
|
||||
fi ; \
|
||||
- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
|
||||
+ $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.default; \
|
||||
done
|
||||
$(INSTALL_DIR) -m 755 $(DATADIR)/mime
|
||||
for file in $(REPLACE); do \
|
||||
diff --git a/notifier/Makefile b/notifier/Makefile
|
||||
index 3206dd0..c34a4d7 100644
|
||||
--- a/notifier/Makefile
|
||||
+++ b/notifier/Makefile
|
||||
@@ -62,7 +62,7 @@ install: all install-data install-headers install-libs install-exec
|
||||
#
|
||||
|
||||
install-data:
|
||||
- $(INSTALL_DIR) -m 775 -g $(CUPS_GROUP) $(CACHEDIR)/rss
|
||||
+ $(INSTALL_DIR) -m 775 $(CACHEDIR)/rss
|
||||
|
||||
|
||||
#
|
||||
diff --git a/scheduler/Makefile b/scheduler/Makefile
|
||||
index 251f017..25f2f5f 100644
|
||||
--- a/scheduler/Makefile
|
||||
+++ b/scheduler/Makefile
|
||||
@@ -146,28 +146,27 @@ install-data:
|
||||
echo Creating $(SERVERBIN)/driver...
|
||||
$(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
|
||||
echo Creating $(SERVERROOT)...
|
||||
- $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)
|
||||
+ $(INSTALL_DIR) -m 755 $(SERVERROOT)
|
||||
echo Creating $(SERVERROOT)/ppd...
|
||||
- $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/ppd
|
||||
+ $(INSTALL_DIR) -m 755 $(SERVERROOT)/ppd
|
||||
if test "x`uname`" != xDarwin; then \
|
||||
echo Creating $(SERVERROOT)/ssl...; \
|
||||
- $(INSTALL_DIR) -m 700 -g $(CUPS_GROUP) $(SERVERROOT)/ssl; \
|
||||
+ $(INSTALL_DIR) -m 700 $(SERVERROOT)/ssl; \
|
||||
fi
|
||||
if test "$(STATEDIR)" != "$(SERVERROOT)"; then \
|
||||
echo Creating $(STATEDIR)...; \
|
||||
$(INSTALL_DIR) -m 755 $(STATEDIR); \
|
||||
fi
|
||||
echo Creating $(STATEDIR)/certs...
|
||||
- $(INSTALL_DIR) -m 511 -o $(CUPS_USER) -g $(CUPS_PRIMARY_SYSTEM_GROUP) \
|
||||
- $(STATEDIR)/certs
|
||||
+ $(INSTALL_DIR) -m 711 $(STATEDIR)/certs
|
||||
echo Creating $(LOGDIR)...
|
||||
$(INSTALL_DIR) -m 755 $(LOGDIR)
|
||||
echo Creating $(REQUESTS)...
|
||||
- $(INSTALL_DIR) -m 710 -g $(CUPS_GROUP) $(REQUESTS)
|
||||
+ $(INSTALL_DIR) -m 710 $(REQUESTS)
|
||||
echo Creating $(REQUESTS)/tmp...
|
||||
- $(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp
|
||||
+ $(INSTALL_DIR) -m 1770 $(REQUESTS)/tmp
|
||||
echo Creating $(CACHEDIR)...
|
||||
- $(INSTALL_DIR) -m 770 -g $(CUPS_GROUP) $(CACHEDIR)
|
||||
+ $(INSTALL_DIR) -m 770 $(CACHEDIR)
|
||||
if test "x$(INITDIR)" != x; then \
|
||||
echo Installing init scripts...; \
|
||||
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From b341a1e1fce48012fc5bcf39337488fd33210616 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sun, 3 Jul 2016 12:20:21 +0200
|
||||
Subject: [PATCH] Remove PIE flags from the build
|
||||
|
||||
Generating a statically linked binary built with PIE requires the
|
||||
Scrt1.o file, which isn't part of Buildroot uClibc toolchains. To
|
||||
solve this, we simply disable the PIE flags.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
Makedefs.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makedefs.in b/Makedefs.in
|
||||
index 3afef0a..299b297 100644
|
||||
--- a/Makedefs.in
|
||||
+++ b/Makedefs.in
|
||||
@@ -142,7 +142,7 @@ IPPFIND_BIN = @IPPFIND_BIN@
|
||||
IPPFIND_MAN = @IPPFIND_MAN@
|
||||
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
|
||||
-L../scheduler @LDARCHFLAGS@ \
|
||||
- @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
|
||||
+ @LDFLAGS@ @RELROFLAGS@ $(OPTIM)
|
||||
LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
|
||||
LINKCUPSIMAGE = @LINKCUPSIMAGE@
|
||||
LIBS = $(LINKCUPS) $(COMMONLIBS)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 79a2389f590f4d16885bdd0715f3f04fd9fa6cc5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Sun, 28 Feb 2016 16:35:56 +0100
|
||||
Subject: [PATCH] Fix static linking with GnuTLS
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
cups forgets to link against the libs found by pkg-config if it is build with
|
||||
GnuTLS support.
|
||||
|
||||
Otherwise, static build fails with:
|
||||
../cups/libcups.a(tls.o): In function `http_gnutls_create_credential':
|
||||
cups-2.1.2/cups/tls-gnutls.c:762: undefined reference to `gnutls_x509_crt_init'
|
||||
[..]
|
||||
|
||||
Status upstream: Pending
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
Makedefs.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makedefs.in b/Makedefs.in
|
||||
index 299b297..ce9d535 100644
|
||||
--- a/Makedefs.in
|
||||
+++ b/Makedefs.in
|
||||
@@ -143,7 +143,7 @@ IPPFIND_MAN = @IPPFIND_MAN@
|
||||
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
|
||||
-L../scheduler @LDARCHFLAGS@ \
|
||||
@LDFLAGS@ @RELROFLAGS@ $(OPTIM)
|
||||
-LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
|
||||
+LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
|
||||
LINKCUPSIMAGE = @LINKCUPSIMAGE@
|
||||
LIBS = $(LINKCUPS) $(COMMONLIBS)
|
||||
ONDEMANDFLAGS = @ONDEMANDFLAGS@
|
||||
--
|
||||
2.7.4
|
||||
|
||||
13
bsp/buildroot-2017.02.11/package/cups/Config.in
Normal file
13
bsp/buildroot-2017.02.11/package/cups/Config.in
Normal file
@@ -0,0 +1,13 @@
|
||||
config BR2_PACKAGE_CUPS
|
||||
bool "cups"
|
||||
# needs libstdcpp for ppdc
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
# needs fork()
|
||||
depends on BR2_USE_MMU
|
||||
help
|
||||
The Common Unix Printing System
|
||||
|
||||
http://www.cups.org
|
||||
|
||||
comment "cups needs a toolchain w/ C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
2
bsp/buildroot-2017.02.11/package/cups/cups.hash
Normal file
2
bsp/buildroot-2017.02.11/package/cups/cups.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally calculated:
|
||||
sha256 f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6 cups-2.2.2-source.tar.gz
|
||||
84
bsp/buildroot-2017.02.11/package/cups/cups.mk
Normal file
84
bsp/buildroot-2017.02.11/package/cups/cups.mk
Normal file
@@ -0,0 +1,84 @@
|
||||
################################################################################
|
||||
#
|
||||
# cups
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CUPS_VERSION = 2.2.2
|
||||
CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
|
||||
CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
|
||||
CUPS_LICENSE = GPLv2, LGPLv2
|
||||
CUPS_LICENSE_FILES = LICENSE.txt
|
||||
CUPS_INSTALL_STAGING = YES
|
||||
CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
|
||||
CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
|
||||
|
||||
# Using autoconf, not autoheader, so we cannot use AUTORECONF = YES.
|
||||
define CUPS_RUN_AUTOCONF
|
||||
cd $(@D); $(HOST_DIR)/usr/bin/autoconf -f
|
||||
endef
|
||||
CUPS_PRE_CONFIGURE_HOOKS += CUPS_RUN_AUTOCONF
|
||||
|
||||
CUPS_CONF_OPTS = \
|
||||
--without-perl \
|
||||
--without-java \
|
||||
--without-php \
|
||||
--disable-gssapi \
|
||||
--libdir=/usr/lib
|
||||
CUPS_CONFIG_SCRIPTS = cups-config
|
||||
CUPS_DEPENDENCIES = \
|
||||
host-autoconf \
|
||||
host-pkgconf \
|
||||
$(if $(BR2_PACKAGE_ZLIB),zlib)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
CUPS_CONF_OPTS += --with-systemd=/usr/lib/systemd/system \
|
||||
--enable-systemd
|
||||
CUPS_DEPENDENCIES += systemd
|
||||
else
|
||||
CUPS_CONF_OPTS += --disable-systemd
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DBUS),y)
|
||||
CUPS_CONF_OPTS += --enable-dbus
|
||||
CUPS_DEPENDENCIES += dbus
|
||||
else
|
||||
CUPS_CONF_OPTS += --disable-dbus
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
CUPS_CONF_OPTS += --enable-gnutls
|
||||
CUPS_DEPENDENCIES += gnutls
|
||||
else
|
||||
CUPS_CONF_OPTS += --disable-gnutls
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||
CUPS_CONF_OPTS += --with-python
|
||||
CUPS_DEPENDENCIES += python
|
||||
else
|
||||
CUPS_CONF_OPTS += --without-python
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUSB),y)
|
||||
CUPS_CONF_OPTS += --enable-libusb
|
||||
CUPS_DEPENDENCIES += libusb
|
||||
else
|
||||
CUPS_CONF_OPTS += --disable-libusb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBPAPER),y)
|
||||
CUPS_CONF_OPTS += --enable-libpaper
|
||||
CUPS_DEPENDENCIES += libpaper
|
||||
else
|
||||
CUPS_CONF_OPTS += --disable-libpaper
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AVAHI),y)
|
||||
CUPS_DEPENDENCIES += avahi
|
||||
CUPS_CONF_OPTS += --enable-avahi
|
||||
else
|
||||
CUPS_CONF_OPTS += --disable-avahi
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user