Initialize branch
This commit is contained in:
No one
Git OBS Bridge
commit
cbc6bd1761
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||||
2
.lfsconfig
Normal file
2
.lfsconfig
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
[lfs]
|
||||||
|
url = http://gitea.opensuse.org:9999/gitlfs
|
||||||
11
README.SUSE
Normal file
11
README.SUSE
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
e2fsprogs-devel
|
||||||
|
---------------
|
||||||
|
Since the e2fsprogs libraries has been split out into own packages,
|
||||||
|
each having its own devel package
|
||||||
|
libext2fs-devel
|
||||||
|
libblkid-devel
|
||||||
|
libuuid-devel
|
||||||
|
libcom_err-devel
|
||||||
|
the e2fsprogs-devel package is deprecated and is provided for temporary
|
||||||
|
backwards compatibility only.
|
||||||
|
|
||||||
11
baselibs.conf
Normal file
11
baselibs.conf
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
libext2fs2
|
||||||
|
libcom_err2
|
||||||
|
obsoletes "libcom_err-<targettype> <= <version>"
|
||||||
|
e2fsprogs
|
||||||
|
e2fsprogs-devel
|
||||||
|
libext2fs-devel
|
||||||
|
requires -libext2fs-<targettype>
|
||||||
|
requires "libext2fs2-<targettype> = <version>"
|
||||||
|
libcom_err-devel
|
||||||
|
requires -libcom_err-<targettype>
|
||||||
|
requires "libcom_err2-<targettype> = <version>"
|
||||||
188
e2fsprogs-1.41.1-splash_support.patch
Normal file
188
e2fsprogs-1.41.1-splash_support.patch
Normal file
@ -0,0 +1,188 @@
|
|||||||
|
Index: e2fsck/Makefile.in
|
||||||
|
===================================================================
|
||||||
|
--- e2fsck/Makefile.in.orig
|
||||||
|
+++ e2fsck/Makefile.in
|
||||||
|
@@ -61,7 +61,7 @@ OBJS= crc32.o dict.o unix.o e2fsck.o sup
|
||||||
|
pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \
|
||||||
|
dx_dirinfo.o ehandler.o problem.o message.o quota.o recovery.o \
|
||||||
|
region.o revoke.o ea_refcount.o rehash.o profile.o prof_err.o \
|
||||||
|
- logfile.o sigcatcher.o $(MTRACE_OBJ)
|
||||||
|
+ logfile.o sigcatcher.o splash.o $(MTRACE_OBJ)
|
||||||
|
|
||||||
|
PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \
|
||||||
|
profiled/super.o profiled/pass1.o profiled/pass1b.o \
|
||||||
|
@@ -100,6 +100,7 @@ SRCS= $(srcdir)/e2fsck.c \
|
||||||
|
$(srcdir)/rehash.c \
|
||||||
|
$(srcdir)/region.c \
|
||||||
|
$(srcdir)/profile.c \
|
||||||
|
+ $(srcdir)/splash.c \
|
||||||
|
$(srcdir)/sigcatcher.c \
|
||||||
|
$(srcdir)/logfile.c \
|
||||||
|
prof_err.c \
|
||||||
|
@@ -519,6 +520,7 @@ region.o: $(srcdir)/region.c $(top_build
|
||||||
|
$(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/quotaio.h \
|
||||||
|
$(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
|
||||||
|
$(top_srcdir)/lib/../e2fsck/dict.h
|
||||||
|
+splash.o: $(srcdir)/splash.c $(srcdir)/splash.h
|
||||||
|
profile.o: $(srcdir)/profile.c $(top_builddir)/lib/config.h \
|
||||||
|
$(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \
|
||||||
|
$(srcdir)/profile.h prof_err.h
|
||||||
|
Index: e2fsck/splash.c
|
||||||
|
===================================================================
|
||||||
|
--- /dev/null
|
||||||
|
+++ e2fsck/splash.c
|
||||||
|
@@ -0,0 +1,100 @@
|
||||||
|
+/*
|
||||||
|
+ * add support for switching the splash screen on boot
|
||||||
|
+ */
|
||||||
|
+#include <stdio.h>
|
||||||
|
+#include <string.h>
|
||||||
|
+#include <sys/types.h>
|
||||||
|
+#include <sys/stat.h>
|
||||||
|
+#include <fcntl.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
+#include <errno.h>
|
||||||
|
+#include "splash.h"
|
||||||
|
+
|
||||||
|
+static int verbose = 0;
|
||||||
|
+
|
||||||
|
+/* nop implementation
|
||||||
|
+ */
|
||||||
|
+static void nop(void)
|
||||||
|
+{
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static struct splash_ops nop_ops = {
|
||||||
|
+ .splash_on = nop,
|
||||||
|
+ .splash_off = nop
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * bootsplash implementation
|
||||||
|
+ */
|
||||||
|
+#define BOOTSPLASH_CTL "/proc/splash"
|
||||||
|
+
|
||||||
|
+static int bootsplash_exists(void)
|
||||||
|
+{
|
||||||
|
+ struct stat sb;
|
||||||
|
+
|
||||||
|
+ if (stat(BOOTSPLASH_CTL, &sb) == -1)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ if (S_ISREG(sb.st_mode))
|
||||||
|
+ return 1;
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* write msg to splash control */
|
||||||
|
+static void bootsplash_msg(const char *msg, size_t size)
|
||||||
|
+{
|
||||||
|
+ int fd;
|
||||||
|
+ size_t written;
|
||||||
|
+
|
||||||
|
+ fd = open(BOOTSPLASH_CTL, O_WRONLY);
|
||||||
|
+ if (fd == -1) {
|
||||||
|
+ if (verbose)
|
||||||
|
+ printf("cannot open %s\n", BOOTSPLASH_CTL);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ written = write(fd, msg, size);
|
||||||
|
+ if (written != size) {
|
||||||
|
+ if (verbose)
|
||||||
|
+ printf("size = %zd, written = %zd\n", size, written);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ close(fd);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void bootsplash_on(void)
|
||||||
|
+{
|
||||||
|
+ if (verbose)
|
||||||
|
+ printf("setting bootsplash silent\n");
|
||||||
|
+ bootsplash_msg("silent\n", 7);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void bootsplash_off(void)
|
||||||
|
+{
|
||||||
|
+ if (verbose)
|
||||||
|
+ printf("setting bootsplash verbose\n");
|
||||||
|
+ bootsplash_msg("verbose\n", 8);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static struct splash_ops bootsplash_ops = {
|
||||||
|
+ .splash_on = bootsplash_on,
|
||||||
|
+ .splash_off = bootsplash_off
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * Initialisation
|
||||||
|
+ */
|
||||||
|
+void splash_init(struct splash_ops **ops)
|
||||||
|
+{
|
||||||
|
+ if (bootsplash_exists())
|
||||||
|
+ *ops = &bootsplash_ops;
|
||||||
|
+ else
|
||||||
|
+ *ops = &nop_ops;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void splash_set_verbose(void)
|
||||||
|
+{
|
||||||
|
+ verbose = 1;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
Index: e2fsck/splash.h
|
||||||
|
===================================================================
|
||||||
|
--- /dev/null
|
||||||
|
+++ e2fsck/splash.h
|
||||||
|
@@ -0,0 +1,13 @@
|
||||||
|
+#ifndef _SPLASH_H
|
||||||
|
+#define _SPLASH_H
|
||||||
|
+
|
||||||
|
+struct splash_ops {
|
||||||
|
+ void (*splash_on)(void);
|
||||||
|
+ void (*splash_off)(void);
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+void splash_init(struct splash_ops **ops);
|
||||||
|
+void splash_set_verbose(void);
|
||||||
|
+
|
||||||
|
+#endif /* _SPLASH_H */
|
||||||
|
+
|
||||||
|
Index: e2fsck/unix.c
|
||||||
|
===================================================================
|
||||||
|
--- e2fsck/unix.c.orig
|
||||||
|
+++ e2fsck/unix.c
|
||||||
|
@@ -51,6 +51,7 @@ extern int optind;
|
||||||
|
#include "e2p/e2p.h"
|
||||||
|
#include "e2fsck.h"
|
||||||
|
#include "problem.h"
|
||||||
|
+#include "splash.h"
|
||||||
|
#include "../version.h"
|
||||||
|
|
||||||
|
/* Command line options */
|
||||||
|
@@ -1177,6 +1178,7 @@ int main (int argc, char *argv[])
|
||||||
|
e2fsck_t ctx;
|
||||||
|
blk64_t orig_superblock;
|
||||||
|
struct problem_context pctx;
|
||||||
|
+ struct splash_ops *sops;
|
||||||
|
int flags, run_result;
|
||||||
|
int journal_size;
|
||||||
|
int sysval, sys_page_size = 4096;
|
||||||
|
@@ -1215,6 +1217,7 @@ int main (int argc, char *argv[])
|
||||||
|
exit(FSCK_ERROR);
|
||||||
|
}
|
||||||
|
reserve_stdio_fds();
|
||||||
|
+ splash_init(&sops);
|
||||||
|
|
||||||
|
set_up_logging(ctx);
|
||||||
|
if (ctx->logf) {
|
||||||
|
@@ -1590,6 +1593,7 @@ print_unsupp_features:
|
||||||
|
fatal_error(ctx, 0);
|
||||||
|
check_if_skip(ctx);
|
||||||
|
check_resize_inode(ctx);
|
||||||
|
+ sops->splash_off();
|
||||||
|
if (bad_blocks_file)
|
||||||
|
read_bad_blocks_file(ctx, bad_blocks_file, replace_bad_blocks);
|
||||||
|
else if (cflag)
|
||||||
12
e2fsprogs-1.42-ext2fsh_implicit.patch
Normal file
12
e2fsprogs-1.42-ext2fsh_implicit.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
Index: lib/ext2fs/ext2fs.h
|
||||||
|
===================================================================
|
||||||
|
--- lib/ext2fs/ext2fs.h.orig 2012-06-04 18:42:23.000000000 +0200
|
||||||
|
+++ lib/ext2fs/ext2fs.h 2012-06-14 09:53:19.190709779 +0200
|
||||||
|
@@ -53,6 +53,7 @@ extern "C" {
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <errno.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
#if EXT2_FLAT_INCLUDES
|
||||||
|
#include "e2_types.h"
|
||||||
18
e2fsprogs-1.42-implicit_fortify_decl.patch
Normal file
18
e2fsprogs-1.42-implicit_fortify_decl.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
Index: lib/ext2fs/mmp.c
|
||||||
|
===================================================================
|
||||||
|
--- lib/ext2fs/mmp.c.orig
|
||||||
|
+++ lib/ext2fs/mmp.c
|
||||||
|
@@ -27,6 +27,13 @@
|
||||||
|
#include "ext2fs/ext2_fs.h"
|
||||||
|
#include "ext2fs/ext2fs.h"
|
||||||
|
|
||||||
|
+#if _BSD_SOURCE || _XOPEN_SOURCE >= 500
|
||||||
|
+#include <netdb.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#include <string.h>
|
||||||
|
+#include <stdio.h>
|
||||||
|
+
|
||||||
|
#ifndef O_DIRECT
|
||||||
|
#define O_DIRECT 0
|
||||||
|
#endif
|
||||||
3
e2fsprogs-1.42.11.tar.gz
Normal file
3
e2fsprogs-1.42.11.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4bd8a770b6925c3f4ec5dce82c55774e4566cd6f3ffb5805177e3c92c8910b76
|
||||||
|
size 6353078
|
||||||
1652
e2fsprogs.changes
Normal file
1652
e2fsprogs.changes
Normal file
File diff suppressed because it is too large
Load Diff
326
e2fsprogs.spec
Normal file
326
e2fsprogs.spec
Normal file
@ -0,0 +1,326 @@
|
|||||||
|
#
|
||||||
|
# spec file for package e2fsprogs
|
||||||
|
#
|
||||||
|
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
Name: e2fsprogs
|
||||||
|
%if 0%{?suse_version} >= 1010
|
||||||
|
# Hint for ZYPP
|
||||||
|
Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4)
|
||||||
|
%endif
|
||||||
|
BuildRequires: autoconf
|
||||||
|
BuildRequires: automake
|
||||||
|
BuildRequires: libblkid-devel
|
||||||
|
BuildRequires: libuuid-devel
|
||||||
|
BuildRequires: pkg-config
|
||||||
|
%if 0%{?suse_version} > 1220
|
||||||
|
BuildRequires: makeinfo
|
||||||
|
%endif
|
||||||
|
# Define info macros if missing (for Fedora builds)
|
||||||
|
%if 0%{!?%install_info_prereq:1}
|
||||||
|
%define install_info_prereq info
|
||||||
|
%define install_info sbin/install-info
|
||||||
|
%define install_info_delete sbin/install-info --delete
|
||||||
|
%endif
|
||||||
|
Requires: %install_info_prereq
|
||||||
|
# bug437293
|
||||||
|
%ifarch ppc64
|
||||||
|
Obsoletes: e2fsprogs-64bit
|
||||||
|
%endif
|
||||||
|
#
|
||||||
|
Version: 1.42.11
|
||||||
|
Release: 0
|
||||||
|
Summary: Utilities for the Second Extended File System
|
||||||
|
License: GPL-2.0
|
||||||
|
Group: System/Filesystems
|
||||||
|
Url: http://e2fsprogs.sourceforge.net
|
||||||
|
Requires: libcom_err2 >= %{version}
|
||||||
|
Requires: libext2fs2 >= %{version}
|
||||||
|
Source: http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.gz
|
||||||
|
Source2: README.SUSE
|
||||||
|
Source3: baselibs.conf
|
||||||
|
#
|
||||||
|
# e2fsprogs patches
|
||||||
|
#
|
||||||
|
Patch1: e2fsprogs-1.41.1-splash_support.patch
|
||||||
|
# libcom_err patches
|
||||||
|
Patch3: libcom_err-compile_et_permissions.patch
|
||||||
|
Patch4: e2fsprogs-1.42-implicit_fortify_decl.patch
|
||||||
|
Patch5: e2fsprogs-1.42-ext2fsh_implicit.patch
|
||||||
|
# Do not suppress make commands
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
|
%description
|
||||||
|
Utilities needed to create and maintain ext2 and ext3 file systems
|
||||||
|
under Linux. Included in this package are: chattr, lsattr, mke2fs,
|
||||||
|
mklost+found, tune2fs, e2fsck, resize2fs, and badblocks.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Dummy development package
|
||||||
|
License: LGPL-2.0
|
||||||
|
Group: Development/Libraries/C and C++
|
||||||
|
# bug437293
|
||||||
|
%ifarch ppc64
|
||||||
|
Obsoletes: e2fsprogs-devel-64bit
|
||||||
|
%endif
|
||||||
|
#
|
||||||
|
Requires: libblkid-devel
|
||||||
|
Requires: libext2fs-devel = %version
|
||||||
|
Requires: libuuid-devel
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
Dummy development package for backwards compatibility.
|
||||||
|
|
||||||
|
%package -n libext2fs2
|
||||||
|
Summary: Ext2fs library
|
||||||
|
License: LGPL-2.0
|
||||||
|
Group: System/Filesystems
|
||||||
|
|
||||||
|
%description -n libext2fs2
|
||||||
|
The basic Ext2fs shared library.
|
||||||
|
|
||||||
|
%package -n libext2fs-devel
|
||||||
|
Summary: Development files for libext2fs
|
||||||
|
License: LGPL-2.0
|
||||||
|
Group: Development/Libraries/C and C++
|
||||||
|
Requires: libcom_err-devel
|
||||||
|
Requires: libext2fs2 = %version
|
||||||
|
|
||||||
|
%description -n libext2fs-devel
|
||||||
|
Development files for libext2fs.
|
||||||
|
|
||||||
|
%package -n libcom_err2
|
||||||
|
Summary: E2fsprogs error reporting library
|
||||||
|
License: MIT
|
||||||
|
Group: System/Filesystems
|
||||||
|
# bug437293
|
||||||
|
%ifarch ppc64
|
||||||
|
Obsoletes: libcom_err-64bit
|
||||||
|
Obsoletes: libcom_err2-64bit
|
||||||
|
%endif
|
||||||
|
#
|
||||||
|
Provides: libcom_err = %{version}
|
||||||
|
Obsoletes: libcom_err <= 1.40
|
||||||
|
|
||||||
|
%description -n libcom_err2
|
||||||
|
com_err is an error message display library.
|
||||||
|
|
||||||
|
%package -n libcom_err-devel
|
||||||
|
Summary: Development files for libcom_err
|
||||||
|
License: MIT
|
||||||
|
Group: Development/Libraries/C and C++
|
||||||
|
# bug437293
|
||||||
|
%ifarch ppc64
|
||||||
|
Obsoletes: libcom_err-devel-64bit
|
||||||
|
%endif
|
||||||
|
#
|
||||||
|
Requires: glibc-devel
|
||||||
|
Requires: libcom_err2 = %version
|
||||||
|
|
||||||
|
%description -n libcom_err-devel
|
||||||
|
Development files for the com_err error message display library.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n e2fsprogs-%{version}
|
||||||
|
# e2fsprogs patches
|
||||||
|
%patch1
|
||||||
|
# libcom_err patches
|
||||||
|
%patch3 -p1
|
||||||
|
%patch4
|
||||||
|
%patch5
|
||||||
|
cp %{SOURCE2} .
|
||||||
|
|
||||||
|
%build
|
||||||
|
autoreconf --force --install
|
||||||
|
%configure \
|
||||||
|
--disable-evms \
|
||||||
|
--with-root-prefix='' \
|
||||||
|
--enable-elf-shlibs \
|
||||||
|
--disable-libblkid \
|
||||||
|
--disable-libuuid \
|
||||||
|
--disable-uuidd \
|
||||||
|
--disable-fsck \
|
||||||
|
CFLAGS="$RPM_OPT_FLAGS"
|
||||||
|
make %{?_smp_mflags} V=1
|
||||||
|
#Guarantee that tranlations match the source messages
|
||||||
|
make -C po update-po
|
||||||
|
|
||||||
|
%install
|
||||||
|
make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_libdir}
|
||||||
|
|
||||||
|
%{find_lang} %{name}
|
||||||
|
|
||||||
|
rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
|
||||||
|
rm -f $RPM_BUILD_ROOT/%{_sbindir}/mkfs.ext4dev
|
||||||
|
rm -f $RPM_BUILD_ROOT/%{_sbindir}/fsck.ext4dev
|
||||||
|
rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4dev.8*
|
||||||
|
rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8*
|
||||||
|
|
||||||
|
# Need libext2fs.a for silo
|
||||||
|
find "%buildroot/%_libdir" -type f -name "*.a" \
|
||||||
|
%ifarch %sparc
|
||||||
|
! -name libext2fs.a \
|
||||||
|
%endif
|
||||||
|
-print -delete
|
||||||
|
#UsrMerge
|
||||||
|
mkdir %{buildroot}/sbin
|
||||||
|
ln -s %{_sbindir}/badblocks %{buildroot}/sbin/badblocks
|
||||||
|
ln -s %{_sbindir}/debugfs %{buildroot}/sbin/debugfs
|
||||||
|
ln -s %{_sbindir}/dumpe2fs %{buildroot}/sbin/dumpe2fs
|
||||||
|
ln -s %{_sbindir}/e2undo %{buildroot}/sbin/e2undo
|
||||||
|
ln -s %{_sbindir}/e2fsck %{buildroot}/sbin/e2fsck
|
||||||
|
ln -s %{_sbindir}/e2label %{buildroot}/sbin/e2label
|
||||||
|
ln -s %{_sbindir}/fsck.ext2 %{buildroot}/sbin/fsck.ext2
|
||||||
|
ln -s %{_sbindir}/fsck.ext3 %{buildroot}/sbin/fsck.ext3
|
||||||
|
ln -s %{_sbindir}/fsck.ext4 %{buildroot}/sbin/fsck.ext4
|
||||||
|
ln -s %{_sbindir}/mke2fs %{buildroot}/sbin/mke2fs
|
||||||
|
ln -s %{_sbindir}/mkfs.ext2 %{buildroot}/sbin/mkfs.ext2
|
||||||
|
ln -s %{_sbindir}/mkfs.ext3 %{buildroot}/sbin/mkfs.ext3
|
||||||
|
ln -s %{_sbindir}/mkfs.ext4 %{buildroot}/sbin/mkfs.ext4
|
||||||
|
ln -s %{_sbindir}/resize2fs %{buildroot}/sbin/resize2fs
|
||||||
|
ln -s %{_sbindir}/tune2fs %{buildroot}/sbin/tune2fs
|
||||||
|
ln -s %{_sbindir}/e2image %{buildroot}/sbin/e2image
|
||||||
|
ln -s %{_sbindir}/logsave %{buildroot}/sbin/logsave
|
||||||
|
mkdir %{buildroot}/%{_lib}
|
||||||
|
pushd %{buildroot}/%{_libdir}
|
||||||
|
LIBNAMES=$(ls *.so.*)
|
||||||
|
popd
|
||||||
|
for libName in $LIBNAMES;
|
||||||
|
do ln -s %{_libdir}/$libName %{buildroot}/%{_lib};
|
||||||
|
done
|
||||||
|
#EndUsrMerge
|
||||||
|
%post
|
||||||
|
/sbin/ldconfig
|
||||||
|
%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
|
||||||
|
|
||||||
|
%postun
|
||||||
|
/sbin/ldconfig
|
||||||
|
%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
|
||||||
|
|
||||||
|
%post -n libext2fs2 -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -n libext2fs2 -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%post -n libcom_err2 -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -n libcom_err2 -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%files -f %{name}.lang
|
||||||
|
%defattr(-, root, root)
|
||||||
|
%doc RELEASE-NOTES README
|
||||||
|
%config /etc/mke2fs.conf
|
||||||
|
#UsrMerge
|
||||||
|
/sbin/badblocks
|
||||||
|
/sbin/debugfs
|
||||||
|
/sbin/dumpe2fs
|
||||||
|
/sbin/e2undo
|
||||||
|
/sbin/e2fsck
|
||||||
|
/sbin/e2label
|
||||||
|
/sbin/fsck.ext2
|
||||||
|
/sbin/fsck.ext3
|
||||||
|
/sbin/fsck.ext4
|
||||||
|
/sbin/mke2fs
|
||||||
|
/sbin/mkfs.ext2
|
||||||
|
/sbin/mkfs.ext3
|
||||||
|
/sbin/mkfs.ext4
|
||||||
|
/sbin/resize2fs
|
||||||
|
/sbin/tune2fs
|
||||||
|
/sbin/e2image
|
||||||
|
/sbin/logsave
|
||||||
|
#EndUsrMerge
|
||||||
|
%{_sbindir}/badblocks
|
||||||
|
%{_sbindir}/debugfs
|
||||||
|
%{_sbindir}/dumpe2fs
|
||||||
|
%{_sbindir}/e2undo
|
||||||
|
%{_sbindir}/e2fsck
|
||||||
|
%{_sbindir}/e2label
|
||||||
|
%{_sbindir}/fsck.ext2
|
||||||
|
%{_sbindir}/fsck.ext3
|
||||||
|
%{_sbindir}/fsck.ext4
|
||||||
|
%{_sbindir}/mke2fs
|
||||||
|
%{_sbindir}/mkfs.ext2
|
||||||
|
%{_sbindir}/mkfs.ext3
|
||||||
|
%{_sbindir}/mkfs.ext4
|
||||||
|
%{_sbindir}/resize2fs
|
||||||
|
%{_sbindir}/tune2fs
|
||||||
|
%{_sbindir}/e2image
|
||||||
|
%{_sbindir}/logsave
|
||||||
|
%{_bindir}/chattr
|
||||||
|
%{_bindir}/lsattr
|
||||||
|
%{_sbindir}/mklost+found
|
||||||
|
%{_sbindir}/filefrag
|
||||||
|
%{_sbindir}/e2freefrag
|
||||||
|
%{_sbindir}/e4defrag
|
||||||
|
%{_infodir}/libext2fs.info.gz
|
||||||
|
%{_mandir}/man1/chattr.1.gz
|
||||||
|
%{_mandir}/man1/lsattr.1.gz
|
||||||
|
%{_mandir}/man5/ext?.5.gz
|
||||||
|
%{_mandir}/man5/e2fsck.conf.5.gz
|
||||||
|
%{_mandir}/man5/mke2fs.conf.5.gz
|
||||||
|
%{_mandir}/man8/*.8.gz
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%doc README.SUSE
|
||||||
|
|
||||||
|
%files -n libext2fs2
|
||||||
|
%defattr(-, root, root)
|
||||||
|
#UsrMerge
|
||||||
|
/%{_lib}/libext2fs.so.*
|
||||||
|
/%{_lib}/libe2p.so.*
|
||||||
|
#EndUsrMerge
|
||||||
|
%{_libdir}/libext2fs.so.*
|
||||||
|
%{_libdir}/libe2p.so.*
|
||||||
|
|
||||||
|
%files -n libext2fs-devel
|
||||||
|
%defattr(-, root, root)
|
||||||
|
%{_libdir}/libext2fs.so
|
||||||
|
%ifarch %sparc
|
||||||
|
%{_libdir}/libext2fs.a
|
||||||
|
%endif
|
||||||
|
%{_libdir}/libe2p.so
|
||||||
|
/usr/include/ext2fs
|
||||||
|
/usr/include/e2p
|
||||||
|
%_libdir/pkgconfig/e2p.pc
|
||||||
|
%_libdir/pkgconfig/ext2fs.pc
|
||||||
|
|
||||||
|
%files -n libcom_err2
|
||||||
|
%defattr(-, root, root)
|
||||||
|
#UsrMerge
|
||||||
|
/%{_lib}/libcom_err.so.*
|
||||||
|
/%{_lib}/libss.so.*
|
||||||
|
#EndUsrMerge
|
||||||
|
%{_libdir}/libcom_err.so.*
|
||||||
|
%{_libdir}/libss.so.*
|
||||||
|
|
||||||
|
%files -n libcom_err-devel
|
||||||
|
%defattr(-, root, root)
|
||||||
|
%_bindir/compile_et
|
||||||
|
%_bindir/mk_cmds
|
||||||
|
%{_libdir}/libcom_err.so
|
||||||
|
%{_libdir}/libss.so
|
||||||
|
%_libdir/pkgconfig/com_err.pc
|
||||||
|
%_libdir/pkgconfig/ss.pc
|
||||||
|
%_includedir/com_err.h
|
||||||
|
%_includedir/et
|
||||||
|
%_includedir/ss
|
||||||
|
%_datadir/et
|
||||||
|
%_datadir/ss
|
||||||
|
%{_mandir}/man1/compile_et.1.gz
|
||||||
|
%{_mandir}/man1/mk_cmds.1.gz
|
||||||
|
%{_mandir}/man3/com_err.3.gz
|
||||||
|
|
||||||
|
%changelog
|
||||||
13
libcom_err-compile_et_permissions.patch
Normal file
13
libcom_err-compile_et_permissions.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: e2fsprogs-1.41.7/lib/et/compile_et.sh.in
|
||||||
|
===================================================================
|
||||||
|
--- e2fsprogs-1.41.7.orig/lib/et/compile_et.sh.in
|
||||||
|
+++ e2fsprogs-1.41.7/lib/et/compile_et.sh.in
|
||||||
|
@@ -51,7 +51,7 @@ if test -f ${BASE}.h && cmp -s ${BASE}.h
|
||||||
|
rm -f ${BASE}.h.$$
|
||||||
|
else
|
||||||
|
mv -f ${BASE}.h.$$ ${BASE}.h
|
||||||
|
- chmod -w ${BASE}.h
|
||||||
|
+# chmod -w ${BASE}.h
|
||||||
|
fi
|
||||||
|
$AWK -f "${DIR}/et_c.awk" "outfile=${BASE}.c.$$" "outfn=${BASE}.c" "$ROOT.et"
|
||||||
|
if test -f ${BASE}.c && cmp -s ${BASE}.c.$$ ${BASE}.c ; then
|
||||||
Loading…
Reference in New Issue
Block a user