jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

cups: bump version to 2.2.2

Browse Source 
And tweak 0003-Sanitize-the-installation-process.patch for this new
release.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Vicente Olivert Riera 2017-01-18 11:46:42 +00:00 committed by Thomas Petazzoni
parent b97b5b7a1d
commit 5e662be891
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/cups/0003-Sanitize-the-installation-process.patch
View File

@ -18,13 +18,16 @@ cross-compiling:
prevent overwriting those files/directories, which meant calling prevent overwriting those files/directories, which meant calling
"make install" twice was failing. "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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
--- ---
Makedefs.in | 12 ++++++------ Makedefs.in | 12 ++++++------
conf/Makefile | 6 +++--- conf/Makefile | 6 +++---
notifier/Makefile | 2 +- notifier/Makefile | 2 +-
scheduler/Makefile | 17 ++++++++--------- scheduler/Makefile | 15 +++++++--------
4 files changed, 18 insertions(+), 19 deletions(-) 4 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/Makedefs.in b/Makedefs.in diff --git a/Makedefs.in b/Makedefs.in
index 3afef0a..3e4f1bd 100644 index 3afef0a..3e4f1bd 100644
@ -84,18 +87,15 @@ index 3206dd0..c34a4d7 100644
# #
diff --git a/scheduler/Makefile b/scheduler/Makefile diff --git a/scheduler/Makefile b/scheduler/Makefile
index c7d244d..a96a528 100644 index 251f017..25f2f5f 100644
--- a/scheduler/Makefile --- a/scheduler/Makefile
+++ b/scheduler/Makefile +++ b/scheduler/Makefile
@@ -148,30 +148,29 @@ install-data: @@ -146,28 +146,27 @@ install-data:
echo Creating $(SERVERBIN)/driver... echo Creating $(SERVERBIN)/driver...
$(INSTALL_DIR) -m 755 $(SERVERBIN)/driver $(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
echo Creating $(SERVERROOT)... echo Creating $(SERVERROOT)...
- $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT) - $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)
+ $(INSTALL_DIR) -m 755 $(SERVERROOT) + $(INSTALL_DIR) -m 755 $(SERVERROOT)
echo Creating $(SERVERROOT)/interfaces...
- $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/interfaces
+ $(INSTALL_DIR) -m 755 $(SERVERROOT)/interfaces
echo Creating $(SERVERROOT)/ppd... echo Creating $(SERVERROOT)/ppd...
- $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/ppd - $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/ppd
+ $(INSTALL_DIR) -m 755 $(SERVERROOT)/ppd + $(INSTALL_DIR) -m 755 $(SERVERROOT)/ppd

2
package/cups/cups.hash
View File

@ -1,2 +1,2 @@
# Locally calculated: # Locally calculated:
sha256 4b14fd833180ac529ebebea766a09094c2568bf8426e219cb3a1715304ef728d cups-2.1.4-source.tar.gz sha256 f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6 cups-2.2.2-source.tar.gz

4
package/cups/cups.mk
View File

@ -4,9 +4,9 @@
# #
################################################################################ ################################################################################
CUPS_VERSION = 2.1.4 CUPS_VERSION = 2.2.2
CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
CUPS_SITE = https://github.com/apple/cups/releases/download/release-$(CUPS_VERSION) CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
CUPS_LICENSE = GPLv2 LGPLv2 CUPS_LICENSE = GPLv2 LGPLv2
CUPS_LICENSE_FILES = LICENSE.txt CUPS_LICENSE_FILES = LICENSE.txt
CUPS_INSTALL_STAGING = YES CUPS_INSTALL_STAGING = YES