Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #323 from alihanozturk/master

Browse Source 
rsyslog:rebuild
This commit is contained in:
Ertuğrul Erata
2016-03-13 12:35:17 +02:00
parent 0e98d794ae c7851080e5
commit 64e8627d40
7 changed files with 126 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/rsyslog/pspec.xml
+7
View File
@@ -54,6 +54,13 @@
</Package>
<History>
<Update release="9">
<Date>2016-03-13</Date>
<Version>8.11.0</Version>
<Comment>Rebuild with new toolchain.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2015-07-13</Date>
<Version>8.11.0</Version>
system/base/sysvinit/pspec.xml
+7
View File
@@ -63,6 +63,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-03-13</Date>
<Version>2.88</Version>
<Comment>Rebuild with new toolchain.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2014-05-11</Date>
<Version>2.88</Version>
system/base/tcp-wrappers/pspec.xml
+7
View File
@@ -65,6 +65,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-03-13</Date>
<Version>7.6</Version>
<Comment>Rebuild with new toolchain.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2014-05-11</Date>
<Version>7.6</Version>
system/base/time/pspec.xml
+7
View File
@@ -27,6 +27,13 @@
</Package>
<History>
<Update release="4">
<Date>2016-03-13</Date>
<Version>1.7</Version>
<Comment>Rebuild with new toolchain.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2014-05-11</Date>
<Version>1.7</Version>
system/base/timezone/actions.py
+4 -3
View File
@@ -12,7 +12,7 @@ from pisi.actionsapi import get
WorkDir = "."
ZoneDir = "/usr/share/zoneinfo"
TargetDir = "%s/%s" % (get.installDIR(), ZoneDir)
TargetDir = "%s%s" % (get.installDIR(), ZoneDir)
RightDir = "%s/right" % TargetDir
PosixDir = "%s/posix" % TargetDir
@@ -31,6 +31,7 @@ def setup():
def install():
pisitools.insinto ("/usr/share/zoneinfo", "iso3166.tab")
pisitools.insinto ("/usr/share/zoneinfo", "zone.tab")
pisitools.insinto ("/usr/share/zoneinfo", "zone1970.tab")
for tzdata in timezones:
cmd = "zic -L /dev/null -d %s -y \"%s/yearistype.sh\" %s" % (TargetDir, get.workDIR(), tzdata)
@@ -39,9 +40,9 @@ def install():
shelltools.system (part2)
part3 = "zic -L leapseconds -d %s -y \"%s/yearistype.sh\" %s" % (RightDir, get.workDIR(), tzdata)
shelltools.system (part3)
shelltools.system ("zic -d %s -y \"%s/yearistype.sh\" %s -p Europe/Istanbul" % (TargetDir, get.workDIR(), tzdata))
#shelltools.system ("zic -d %s -y \"%s/yearistype.sh\" %s -p Europe/Istanbul" % (TargetDir, get.workDIR(), tzdata))
#shelltools.system ("zic -d %s -p Europe/Istanbul" % TargetDir)
shelltools.system ("zic -d %s -p Europe/Istanbul" % TargetDir)
system/base/timezone/files/timezone-data-2016a-makefile.patch
+84
View File
@@ -0,0 +1,84 @@
- Fix up default paths
- Support env CC
- Don't build/install libtz.a
- Don't install man-pages provided by sys-apps/man-pages
- Move tzselect, zic, and zdump to bin
- Do not run network based unittests
--- a/Makefile
+++ b/Makefile
@@ -45,21 +45,21 @@ POSIXRULES= America/New_York
# Everything gets put in subdirectories of. . .
-TOPDIR= /usr/local
+TOPDIR= /usr
# "Compiled" time zone information is placed in the "TZDIR" directory
# (and subdirectories).
# Use an absolute path name for TZDIR unless you're just testing the software.
TZDIR_BASENAME= zoneinfo
-TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME)
+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME)
# Types to try, as an alternative to time_t. int64_t should be first.
TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
# The "tzselect", "zic", and "zdump" commands get installed in. . .
-ETCDIR= $(TOPDIR)/etc
+SBINDIR= $(TOPDIR)/sbin
# If you "make INSTALL", the "date" command gets installed in. . .
@@ -67,7 +67,7 @@ BINDIR= $(TOPDIR)/bin
# Manual pages go in subdirectories of. . .
-MANDIR= $(TOPDIR)/man
+MANDIR= $(TOPDIR)/share/man
# Library functions are put in an archive in LIBDIR.
@@ -298,8 +298,10 @@ GZIPFLAGS= -9n
#MAKE= make
-cc= cc
-CC= $(cc) -DTZDIR=\"$(TZDIR)\"
+CPPFLAGS+= -DTZDIR=\"$(TZDIR)\"
+ifeq ($(NLS),1)
+CPPFLAGS+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
+endif
AR= ar
@@ -352,16 +354,12 @@ ALL: all date
install: all $(DATA) $(REDO) $(MANS)
mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
- $(DESTDIR)$(LIBDIR) \
+ $(DESTDIR)$(BINDIR) \
$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
$(DESTDIR)$(MANDIR)/man8
$(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
+ cp tzselect zic zdump $(DESTDIR)$(BINDIR)/.
- cp libtz.a $(DESTDIR)$(LIBDIR)/.
- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
INSTALL: ALL install date.1
mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
@@ -440,7 +438,7 @@ tzselect: tzselect.ksh
chmod +x $@
check: check_character_set check_white_space check_links check_sorted \
- check_tables check_web
+ check_tables
check_character_set: $(ENCHILADA)
LC_ALL=en_US.utf8 && export LC_ALL && \
system/base/timezone/pspec.xml
+10 -2
View File
@@ -14,14 +14,15 @@
<IsA>data</IsA>
<Summary>Timezone data files and tools</Summary>
<Description>timezone includes timezone data files and tools to use them. Package contents are synchronized with glibc tree.</Description>
<Archive sha1sum="96528dcbb790ed181a47db7e4cace4eeaec5728e" type="targz">http://www.iana.org/time-zones/repository/releases/tzdata2015g.tar.gz</Archive>
<Archive sha1sum="9ba86f3bfc1c7c3470eeb6963dd6ac84c9195d69" type="targz">http://www.iana.org/time-zones/repository/releases/tzdata2016a.tar.gz</Archive>
<!--<Archive sha1sum="807cf10ef545314989175096aba605bee4062b61" type="targz">http://www.iana.org/time-zones/repository/releases/tzcode2015d.tar.gz</Archive>-->
<BuildDependencies>
<Dependency>perl</Dependency>
<Dependency>gawk</Dependency>
</BuildDependencies>
<Patches>
<Patch>timezone-data-2015c-makefile.patch</Patch>
<!-- <Patch>timezone-data-2015c-makefile.patch</Patch> -->
<Patch>timezone-data-2016a-makefile.patch</Patch>
</Patches>
<AdditionalFiles>
<!--<AdditionalFile permission="0755" target="yearistype.sh">yearistype.sh</AdditionalFile>-->
@@ -36,6 +37,13 @@
</Package>
<History>
<Update release="6">
<Date>2016-03-13</Date>
<Version>2016a</Version>
<Comment>Version bump.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2015-10-27</Date>
<Version>2015g</Version>