Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | 4ac24d5881 | |
Bill Nottingham | 1b9e50fc51 | |
Ville Skyttä | be8dc8f198 | |
Jesse Keating | 56bc50b49b |
|
@ -1,2 +1,9 @@
|
|||
redhat-lsb-4.0-1.tar.bz2
|
||||
/redhat-lsb-4.1-1.tar.bz2
|
||||
lsb-release-1.4.tar.gz
|
||||
redhat-lsb-1.3.tar.bz2
|
||||
redhat-lsb-3.0-1.tar.bz2
|
||||
redhat-lsb-3.1-1.tar.bz2
|
||||
redhat-lsb-3.1-2.tar.bz2
|
||||
redhat-lsb-3.1-3.tar.bz2
|
||||
redhat-lsb-3.1-4.tar.bz2
|
||||
redhat-lsb-3.1-5.tar.bz2
|
||||
lsb-release-2.0.tar.gz
|
||||
|
|
|
@ -1,131 +0,0 @@
|
|||
diff --git a/redhat_lsb_trigger.c b/redhat_lsb_trigger.c
|
||||
index 76db260..f76e5a5 100644
|
||||
--- a/redhat_lsb_trigger.c
|
||||
+++ b/redhat_lsb_trigger.c
|
||||
@@ -424,6 +424,102 @@ register void *__thread_self __asm ("g7");
|
||||
: inline_syscall_clobbers, "$20", "$21"); \
|
||||
_sc_ret = _sc_0, _sc_err = _sc_19; \
|
||||
}
|
||||
+#elif defined __aarch64__
|
||||
+#undef SYS_ify
|
||||
+#define SYS_ify(syscall_name) (__NR_##syscall_name)
|
||||
+
|
||||
+# undef INLINE_SYSCALL
|
||||
+# define INLINE_SYSCALL(name, nr, args...) \
|
||||
+ ({ unsigned long _sys_result = INTERNAL_SYSCALL (name, , nr, args); \
|
||||
+ if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (_sys_result, ), 0))\
|
||||
+ { \
|
||||
+ __set_errno (INTERNAL_SYSCALL_ERRNO (_sys_result, )); \
|
||||
+ _sys_result = (unsigned long) -1; \
|
||||
+ } \
|
||||
+ (long) _sys_result; })
|
||||
+
|
||||
+# undef INTERNAL_SYSCALL_DECL
|
||||
+# define INTERNAL_SYSCALL_DECL(err) do { } while (0)
|
||||
+
|
||||
+# undef INTERNAL_SYSCALL_RAW
|
||||
+# define INTERNAL_SYSCALL_RAW(name, err, nr, args...) \
|
||||
+ ({ unsigned long _sys_result; \
|
||||
+ { \
|
||||
+ LOAD_ARGS_##nr (args) \
|
||||
+ register long _x8 asm ("x8") = (name); \
|
||||
+ asm volatile ("svc 0 // syscall " # name \
|
||||
+ : "+r" (_x0), "+r" (_x8) \
|
||||
+ : ASM_ARGS_##nr \
|
||||
+ : "memory", CLOBBER_ARGS_##nr); \
|
||||
+ _sys_result = _x0; \
|
||||
+ } \
|
||||
+ (long) _sys_result; })
|
||||
+
|
||||
+# undef INTERNAL_SYSCALL
|
||||
+# define INTERNAL_SYSCALL(name, err, nr, args...) \
|
||||
+ INTERNAL_SYSCALL_RAW(SYS_ify(name), err, nr, args)
|
||||
+
|
||||
+# undef INTERNAL_SYSCALL_ERROR_P
|
||||
+# define INTERNAL_SYSCALL_ERROR_P(val, err) \
|
||||
+ ((unsigned long) (val) >= (unsigned long) -4095)
|
||||
+
|
||||
+# undef INTERNAL_SYSCALL_ERRNO
|
||||
+# define INTERNAL_SYSCALL_ERRNO(val, err) (-(val))
|
||||
+
|
||||
+# define CLOBBER_ARGS_0 CLOBBER_ARGS_1
|
||||
+# define CLOBBER_ARGS_1 "x1", CLOBBER_ARGS_2
|
||||
+# define CLOBBER_ARGS_2 "x2", CLOBBER_ARGS_3
|
||||
+# define CLOBBER_ARGS_3 "x3", CLOBBER_ARGS_4
|
||||
+# define CLOBBER_ARGS_4 "x4", CLOBBER_ARGS_5
|
||||
+# define CLOBBER_ARGS_5 "x5", CLOBBER_ARGS_6
|
||||
+# define CLOBBER_ARGS_6 "x6", CLOBBER_ARGS_7
|
||||
+# define CLOBBER_ARGS_7 \
|
||||
+ "x7", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18"
|
||||
+
|
||||
+# define LOAD_ARGS_0() \
|
||||
+ register long _x0 asm ("x0");
|
||||
+
|
||||
+# define ASM_ARGS_0
|
||||
+# define LOAD_ARGS_1(x0) \
|
||||
+ long _x0tmp = (long) (x0); \
|
||||
+ LOAD_ARGS_0 () \
|
||||
+ _x0 = _x0tmp;
|
||||
+# define ASM_ARGS_1 "r" (_x0)
|
||||
+# define LOAD_ARGS_2(x0, x1) \
|
||||
+ long _x1tmp = (long) (x1); \
|
||||
+ LOAD_ARGS_1 (x0) \
|
||||
+ register long _x1 asm ("x1") = _x1tmp;
|
||||
+# define ASM_ARGS_2 ASM_ARGS_1, "r" (_x1)
|
||||
+# define LOAD_ARGS_3(x0, x1, x2) \
|
||||
+ long _x2tmp = (long) (x2); \
|
||||
+ LOAD_ARGS_2 (x0, x1) \
|
||||
+ register long _x2 asm ("x2") = _x2tmp;
|
||||
+# define ASM_ARGS_3 ASM_ARGS_2, "r" (_x2)
|
||||
+# define LOAD_ARGS_4(x0, x1, x2, x3) \
|
||||
+ long _x3tmp = (long) (x3); \
|
||||
+ LOAD_ARGS_3 (x0, x1, x2) \
|
||||
+ register long _x3 asm ("x3") = _x3tmp;
|
||||
+# define ASM_ARGS_4 ASM_ARGS_3, "r" (_x3)
|
||||
+# define LOAD_ARGS_5(x0, x1, x2, x3, x4) \
|
||||
+ long _x4tmp = (long) (x4); \
|
||||
+ LOAD_ARGS_4 (x0, x1, x2, x3) \
|
||||
+ register long _x4 asm ("x4") = _x4tmp;
|
||||
+# define ASM_ARGS_5 ASM_ARGS_4, "r" (_x4)
|
||||
+# define LOAD_ARGS_6(x0, x1, x2, x3, x4, x5) \
|
||||
+ long _x5tmp = (long) (x5); \
|
||||
+ LOAD_ARGS_5 (x0, x1, x2, x3, x4) \
|
||||
+ register long _x5 asm ("x5") = _x5tmp;
|
||||
+# define ASM_ARGS_6 ASM_ARGS_5, "r" (_x5)
|
||||
+# define LOAD_ARGS_7(x0, x1, x2, x3, x4, x5, x6)\
|
||||
+ long _x6tmp = (long) (x6); \
|
||||
+ LOAD_ARGS_6 (x0, x1, x2, x3, x4, x5) \
|
||||
+ register long _x6 asm ("x6") = _x6tmp;
|
||||
+# define ASM_ARGS_7 ASM_ARGS_6, "r" (_x6)
|
||||
+
|
||||
+# undef INTERNAL_SYSCALL_NCS
|
||||
+# define INTERNAL_SYSCALL_NCS(number, err, nr, args...) \
|
||||
+ INTERNAL_SYSCALL_RAW (number, err, nr, args)
|
||||
+
|
||||
#endif
|
||||
|
||||
#ifdef __i386__
|
||||
@@ -539,10 +635,14 @@ int main (int argc, char **argv)
|
||||
p = mempcpy (p, LSBLDSO, sizeof LSBLDSO - 1);
|
||||
*p++ = '.';
|
||||
strcpy (p, LSBVER);
|
||||
+#if defined(__NR_symlink)
|
||||
if (is_ia64 ())
|
||||
INTERNAL_SYSCALL (symlink, err, 2, "/emul/ia32-linux/lib/" LDSO, buf);
|
||||
else
|
||||
INTERNAL_SYSCALL (symlink, err, 2, LDSO, buf);
|
||||
+#elif defined(__NR_symlinkat)
|
||||
+ INTERNAL_SYSCALL (symlinkat, err, 3, AT_FDCWD, LDSO, buf);
|
||||
+#endif
|
||||
p = NULL;
|
||||
}
|
||||
INTERNAL_SYSCALL (exit, err, 1, 0);
|
||||
@@ -682,7 +682,7 @@ int __libc_start_main (int argc, char **argv, char **ev,
|
||||
void *auxvec, void (*rtld_fini) (void),
|
||||
struct startup_info *stinfo,
|
||||
char **stack_on_entry)
|
||||
-#elif defined __arm__
|
||||
+#elif defined __arm__ || defined __aarch64__
|
||||
|
||||
int ___libc_start_main (int (*main) (int argc, char **argv),
|
||||
int argc, char **argv,
|
|
@ -1,45 +0,0 @@
|
|||
--- redhat-lsb-3.2.orig/redhat_lsb_trigger.c 2008-04-16 13:50:14.000000000 -0400
|
||||
+++ redhat-lsb-3.2/redhat_lsb_trigger.c 2009-02-03 04:39:06.000000000 -0500
|
||||
@@ -223,6 +223,42 @@ register void *__thread_self __asm ("g7"
|
||||
# define ASMFMT_1 , "0" (gpr2)
|
||||
# define ASMFMT_2 , "0" (gpr2), "d" (gpr3)
|
||||
# define ASMFMT_3 , "0" (gpr2), "d" (gpr3), "d" (gpr4)
|
||||
+#elif defined __arm__
|
||||
+# if defined (__ARM_EABI__)
|
||||
+#undef INTERNAL_SYSCALL_DECL
|
||||
+#define INTERNAL_SYSCALL_DECL(err) do { } while (0)
|
||||
+#undef INTERNAL_SYSCALL_RAW
|
||||
+#define INTERNAL_SYSCALL_RAW(name, err, nr, args...) \
|
||||
+ ({ \
|
||||
+ register int _a1 asm ("r0"), _nr asm ("r7"); \
|
||||
+ LOAD_ARGS_##nr (args) \
|
||||
+ _nr = name; \
|
||||
+ asm volatile ("swi 0x0 @ syscall " #name \
|
||||
+ : "=r" (_a1) \
|
||||
+ : "r" (_nr) ASM_ARGS_##nr \
|
||||
+ : "memory"); \
|
||||
+ _a1; })
|
||||
+
|
||||
+#undef INTERNAL_SYSCALL
|
||||
+#define INTERNAL_SYSCALL(name, err, nr, args...) \
|
||||
+ INTERNAL_SYSCALL_RAW(SYS_ify(name), err, nr, args)
|
||||
+
|
||||
+#define LOAD_ARGS_0()
|
||||
+#define ASM_ARGS_0
|
||||
+#define LOAD_ARGS_1(a1) \
|
||||
+ int _a1tmp = (int) (a1); \
|
||||
+ LOAD_ARGS_0 () \
|
||||
+ _a1 = _a1tmp;
|
||||
+#define ASM_ARGS_1 ASM_ARGS_0, "r" (_a1)
|
||||
+#define LOAD_ARGS_2(a1, a2) \
|
||||
+ int _a2tmp = (int) (a2); \
|
||||
+ LOAD_ARGS_1 (a1) \
|
||||
+ register int _a2 asm ("a2") = _a2tmp;
|
||||
+#define ASM_ARGS_2 ASM_ARGS_1, "r" (_a2)
|
||||
+#undef SYS_ify
|
||||
+#define SWI_BASE (0x900000)
|
||||
+#define SYS_ify(syscall_name) (__NR_##syscall_name)
|
||||
+#endif
|
||||
#elif defined __sparc__
|
||||
# ifndef __arch64__
|
||||
# define __INTERNAL_SYSCALL_STRING \
|
|
@ -1,43 +0,0 @@
|
|||
diff -up redhat-lsb-3.1/lsb_start_daemon.orig redhat-lsb-3.1/lsb_start_daemon
|
||||
--- redhat-lsb-3.1/lsb_start_daemon.orig 2009-05-15 11:20:17.000000000 -0400
|
||||
+++ redhat-lsb-3.1/lsb_start_daemon 2009-05-15 11:33:03.000000000 -0400
|
||||
@@ -4,6 +4,9 @@
|
||||
|
||||
nice=
|
||||
force=
|
||||
+pidfile=
|
||||
+user=
|
||||
+check=
|
||||
RETVAL=
|
||||
while [ "$1" != "${1##[-+]}" ]; do
|
||||
case $1 in
|
||||
@@ -15,7 +18,28 @@ while [ "$1" != "${1##[-+]}" ]; do
|
||||
nice=$2
|
||||
shift 2
|
||||
;;
|
||||
+ -p)
|
||||
+ pidfile="--pidfile $2"
|
||||
+ shift 2
|
||||
+ ;;
|
||||
+ -u)
|
||||
+ user="--user $2"
|
||||
+ shift 2
|
||||
+ ;;
|
||||
+ -c)
|
||||
+ check="--check $2"
|
||||
+ shift 2
|
||||
+ ;;
|
||||
+ *)
|
||||
+ echo "Unknown Option $1"
|
||||
+ echo "Options are:"
|
||||
+ echo "-f"
|
||||
+ echo "-p {pidfile}"
|
||||
+ echo "-n [+/-nicelevel]"
|
||||
+ echo "-u {user}"
|
||||
+ echo "-c {base}"
|
||||
+ exit 1;;
|
||||
esac
|
||||
done
|
||||
-LSB=LSB-1.1 daemon ${force:-} ${nice:-} $*
|
||||
+LSB=LSB-1.1 daemon ${force:-} ${nice:-} ${pidfile:-} ${user:-} ${check:-} $*
|
||||
exit $?
|
|
@ -1,134 +0,0 @@
|
|||
--- redhat_lsb_trigger.c.triggerfix 2008-04-16 18:50:14.000000000 +0100
|
||||
+++ redhat_lsb_trigger.c 2011-09-14 11:50:42.563080000 +0100
|
||||
@@ -423,10 +423,76 @@
|
||||
#define is_ia64() 0
|
||||
#endif
|
||||
|
||||
+char *
|
||||
+strtok (char *p, const char *delim)
|
||||
+{
|
||||
+ static char *olds;
|
||||
+ const char *d;
|
||||
+ char *token;
|
||||
+ if (p == NULL)
|
||||
+ p = olds;
|
||||
+ while (*p)
|
||||
+ {
|
||||
+ for (d = delim; *d; d++)
|
||||
+ if (*p == *d)
|
||||
+ break;
|
||||
+ if (!*d)
|
||||
+ break;
|
||||
+ p++;
|
||||
+ }
|
||||
+ if (!*p)
|
||||
+ {
|
||||
+ olds = p;
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ token = p;
|
||||
+ while (*p)
|
||||
+ {
|
||||
+ for (d = delim; *d; d++)
|
||||
+ if (*p == *d)
|
||||
+ break;
|
||||
+ if (*d)
|
||||
+ break;
|
||||
+ p++;
|
||||
+ }
|
||||
+ if (!*p)
|
||||
+ olds = p;
|
||||
+ else
|
||||
+ {
|
||||
+ *p = '\0';
|
||||
+ olds = p + 1;
|
||||
+ }
|
||||
+ return token;
|
||||
+}
|
||||
+
|
||||
+size_t
|
||||
+strlen (const char *s)
|
||||
+{
|
||||
+ const char *p;
|
||||
+ for (p = s; *p; ++p);
|
||||
+ return p - s;
|
||||
+}
|
||||
+
|
||||
+void *
|
||||
+mempcpy (void *dst, const void *src, size_t n)
|
||||
+{
|
||||
+ char *d = dst;
|
||||
+ const char *s = src;
|
||||
+ while (n--)
|
||||
+ *d++ = *s++;
|
||||
+ return d;
|
||||
+}
|
||||
+
|
||||
+char *
|
||||
+strcpy (char *dst, const char *src)
|
||||
+{
|
||||
+ char *ret = dst;
|
||||
+ while ((*dst++ = *src++) != '\0');
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
int main (int argc, char **argv)
|
||||
{
|
||||
-/* redhat_lsb_trigger.c:428: warning: unused variable 'ret' */
|
||||
-/* long ret; */
|
||||
INTERNAL_SYSCALL_DECL (err);
|
||||
char lsbsover[] = LSBSOVER;
|
||||
char *LSBVER, *p = lsbsover;
|
||||
@@ -450,15 +516,38 @@
|
||||
int __libc_multiple_threads __attribute__((nocommon));
|
||||
int __libc_enable_asynccancel (void) { return 0; }
|
||||
void __libc_disable_asynccancel (int x) { }
|
||||
+#ifndef __arm__
|
||||
void __libc_csu_init (void) { }
|
||||
void __libc_csu_fini (void) { }
|
||||
+#endif
|
||||
pid_t __fork (void) { return -1; }
|
||||
char thr_buf[65536];
|
||||
|
||||
-#ifndef __powerpc__
|
||||
+void
|
||||
+__attribute__ ((noreturn))
|
||||
+__stack_chk_fail (void)
|
||||
+{
|
||||
+ INTERNAL_SYSCALL_DECL (err);
|
||||
+ while (1)
|
||||
+ INTERNAL_SYSCALL (exit, err, 1, 1);
|
||||
+}
|
||||
+
|
||||
+#if defined __powerpc__
|
||||
+
|
||||
+struct startup_info
|
||||
+{
|
||||
+ void *sda_base;
|
||||
+ int (*main) (int, char **, char **, void *);
|
||||
+ int (*init) (int, char **, char **, void *);
|
||||
+ void (*fini) (void);
|
||||
+};
|
||||
+
|
||||
+int __libc_start_main (int argc, char **argv, char **ev,
|
||||
+ void *auxvec, void (*rtld_fini) (void),
|
||||
+ struct startup_info *stinfo,
|
||||
+ char **stack_on_entry)
|
||||
+#elif defined __arm__
|
||||
|
||||
-/* /usr/lib/gcc/ppc64-redhat-linux/4.1.2/../../../../lib64/libc.a(libc-start.o): In function `__libc_start_main':
|
||||
- * * (.opd+0x10): multiple definition of `__libc_start_main' */
|
||||
int ___libc_start_main (int (*main) (int argc, char **argv),
|
||||
int argc, char **argv,
|
||||
void (*init) (void), void (*fini) (void),
|
||||
@@ -472,9 +561,7 @@
|
||||
void (*fini) (void);
|
||||
};
|
||||
|
||||
-/* /usr/lib/gcc/ppc64-redhat-linux/4.1.2/../../../../lib64/libc.a(libc-start.o): In function `__libc_start_main':
|
||||
- * (.opd+0x10): multiple definition of `__libc_start_main' */
|
||||
-int ___libc_start_main (int argc, char **argv, char **ev,
|
||||
+int __libc_start_main (int argc, char **argv, char **ev,
|
||||
void *auxvec, void (*rtld_fini) (void),
|
||||
struct startup_info *stinfo,
|
||||
char **stack_on_entry)
|
1097
redhat-lsb.spec
1097
redhat-lsb.spec
File diff suppressed because it is too large
Load Diff
|
@ -1,72 +0,0 @@
|
|||
Diff against 3.1-22:
|
||||
Index: redhat-lsb.spec
|
||||
===================================================================
|
||||
RCS file: /cvs/pkgs/devel/redhat-lsb/redhat-lsb.spec,v
|
||||
retrieving revision 1.38
|
||||
diff -u -p -r1.38 redhat-lsb.spec
|
||||
--- redhat-lsb.spec 7 Aug 2008 08:46:31 -0000 1.38
|
||||
+++ redhat-lsb.spec 11 Aug 2008 10:34:20 -0000
|
||||
@@ -36,6 +36,11 @@
|
||||
%define lsbldso ld-lsb-x86-64.so
|
||||
%endif
|
||||
|
||||
+%ifarch alpha
|
||||
+%define ldso ld-linux-alpha.so.2
|
||||
+%define lsbldso ld-lsb-alpha.so
|
||||
+%endif
|
||||
+
|
||||
%ifarch ia64 ppc64 s390x x86_64
|
||||
%define qual ()(64bit)
|
||||
%else
|
||||
@@ -82,12 +87,15 @@ Provides: lsb = %{version}
|
||||
%ifarch x86_64
|
||||
%define archname amd64
|
||||
%endif
|
||||
+%ifarch alpha
|
||||
+%define archname alpha
|
||||
+%endif
|
||||
Provides: lsb-core-%{archname} = %{version}
|
||||
Provides: lsb-graphics-%{archname} = %{version}
|
||||
Provides: lsb-core-noarch = %{version}
|
||||
Provides: lsb-graphics-noarch = %{version}
|
||||
|
||||
-ExclusiveArch: i386 ia64 x86_64 ppc ppc64 s390 s390x
|
||||
+ExclusiveArch: i386 ia64 x86_64 ppc ppc64 s390 s390x alpha
|
||||
|
||||
%ifarch %{ix86}
|
||||
# archLSB IA32 Base Libraries
|
||||
@@ -187,16 +195,34 @@ Requires: libc.so.6()(64bit)
|
||||
Requires: libstdc++.so.6()(64bit)
|
||||
%endif
|
||||
|
||||
+%ifarch alpha
|
||||
+# archLSB Alpha Base Libraries
|
||||
+Requires: libz.so.1
|
||||
+Requires: libutil.so.1.1
|
||||
+Requires: libpthread.so.0
|
||||
+Requires: libncurses.so.5
|
||||
+Requires: libm.so.6.1
|
||||
+Requires: libgcc_s.so.1
|
||||
+Requires: libdl.so.2.1
|
||||
+Requires: libcrypt.so.1.1
|
||||
+Requires: libc.so.6.1
|
||||
+Requires: libstdc++.so.6
|
||||
+%endif
|
||||
+
|
||||
# gLSB Base/Utility/Stdc++/Graphics Libraries
|
||||
Requires: libz.so.1%{qual}
|
||||
+%ifnarch alpha
|
||||
Requires: libutil.so.1%{qual}
|
||||
+%endif
|
||||
Requires: librt.so.1%{qual}
|
||||
Requires: libpthread.so.0%{qual}
|
||||
Requires: libpam.so.0%{qual}
|
||||
Requires: libncurses.so.5%{qual}
|
||||
Requires: libgcc_s.so.1%{qual}
|
||||
+%ifnarch alpha
|
||||
Requires: libdl.so.2%{qual}
|
||||
Requires: libcrypt.so.1%{qual}
|
||||
+%endif
|
||||
Requires: libstdc++.so.6%{qual}
|
||||
Requires: libXt.so.6%{qual}
|
||||
Requires: libXi.so.6%{qual}
|
11
sources
11
sources
|
@ -1 +1,10 @@
|
|||
9c1e474cb81c0ee1941c3129e0e50ea1 redhat-lsb-4.1-1.tar.bz2
|
||||
30537ef5a01e0ca94b7b8eb6a36bb1e4 lsb-release-1.4.tar.gz
|
||||
f535414957ea3f7810b098f4ac7e4c50 redhat-lsb-1.3.tar.bz2
|
||||
6dc78435cc0837d9d75f7298587787bc redhat-lsb-3.0-1.tar.bz2
|
||||
64518d9c2577e6072df40d7623e22ebc redhat-lsb-3.0-2.tar.bz2
|
||||
f252ed03702b93eb09e9448e48acd767 redhat-lsb-3.1-1.tar.bz2
|
||||
82fe26793fb0f6b50536842e9e2dc489 redhat-lsb-3.1-2.tar.bz2
|
||||
5a80bf847206e339203f66eac9430c4b redhat-lsb-3.1-3.tar.bz2
|
||||
7f388b809484b42faf92004995db3239 redhat-lsb-3.1-4.tar.bz2
|
||||
12f2f2ee2e03d6c861109965326294ff redhat-lsb-3.1-5.tar.bz2
|
||||
f4b50cc38065cf46e9102fd357d1eb0b lsb-release-2.0.tar.gz
|
||||
|
|
Loading…
Reference in New Issue