Re: [devel] propagator - diet vs glibc

["Nick S. Grechukh" <gns@altlinux.ru>]

[-- Attachment #1: Type: text/plain, Size: 28 bytes --]

вот аккуратный патч на гит.

[-- Attachment #2: propagator.git-20061123-glibc.gns2.patch --]
[-- Type: text/x-patch, Size: 3554 bytes --]

diff --git a/Makefile b/Makefile
index 925cf26..e46ff11 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ INITOBJS = $(subst .c,.o,$(INITSRC))
 
 #- frontends
 NEWT_FRONTEND_SRC = newt-frontend.c
-GLIBC_NEWT_FRONTEND_LIBS = newt/libnewt.a slang/libslang.a
+GLIBC_NEWT_FRONTEND_LIBS = $(LIBDIR)/libnewt.a $(LIBDIR)/libslang.a
 DIETLIBC_NEWT_FRONTEND_LIBS = $(DIET_LIBDIR)/libnewt.a $(DIET_LIBDIR)/libslang.a
 
 STDIO_FRONTEND_SRC = stdio-frontend.c
@@ -94,7 +94,7 @@ DIETLIBC_STDIO_FRONTEND_LIBS =
 FRONTEND_OBJS = $(subst .c,.o,$($(F)_FRONTEND_SRC))
 FRONTEND_LINK = $(FRONTEND_OBJS) $($(L)_$(F)_FRONTEND_LIBS)
 
-GLIBC_STAGE1_OWN_LIBS = mar/libmar.a /usr/lib/libbz2.a
+GLIBC_STAGE1_OWN_LIBS = $(LIBDIR)/libmar.a $(LIBDIR)/libbz2.a
 DIETLIBC_STAGE1_OWN_LIBS = $(DIET_LIBDIR)/libmar.a $(DIET_LIBDIR)/libbz2.a
 STAGE1_OWN_LIBS = $($(L)_STAGE1_OWN_LIBS)
 
@@ -125,8 +125,8 @@ ifeq (ia64, $(ARCH))
 LDFLAGS_INIT = $(GLIBC_LDFLAGS_STAGE1)
 INIT_LIBC = $(GLIBC_LIBC)
 else
-LDFLAGS_INIT = $(DIETLIBC_LDFLAGS_STAGE1)
-INIT_LIBC = $(DIETLIBC_LIBC)
+LDFLAGS_INIT = $(GLIBC_LDFLAGS_STAGE1)
+INIT_LIBC = $(GLIBC_LIBC)
 endif
 endif
 
diff --git a/Makefile.common b/Makefile.common
index ffd02c0..f892ff0 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -14,13 +14,13 @@
  #
  #*****************************************************************************
 
-include /usr/lib/dietlibc/Makefile.rules
+#include /usr/lib/dietlibc/Makefile.rules
 
-DIET_LIBDIR = /usr/lib/dietlibc/lib-$(ARCH)
+#DIET_LIBDIR = /usr/lib/dietlibc/lib-$(ARCH)
 
  #- default lib is dietlibc (honoured by main Makefile whenever possible)
-L = DIETLIBC
-#L = GLIBC
+#L = DIETLIBC
+L = GLIBC
 
  #- default frontend is newt (honoured by main Makefile whenever possible)
 F = NEWT
diff --git a/init.c b/init.c
index 7f394bc..942d734 100644
--- a/init.c
+++ b/init.c
@@ -377,8 +377,6 @@ void unmount_filesystems(void)
 #define RAMFS_MAGIC 0x858458f6
 #define TMPFS_MAGIC 0x01021994
 
-#define MS_MOVE 8192
-
 int main(int argc, char **argv)
 {
 	struct stat rst, cst, ist;
diff --git a/network.c b/network.c
index 29d41d2..5cb7b75 100644
--- a/network.c
+++ b/network.c
@@ -18,6 +18,8 @@
  * Copyright 1996 Red Hat Software 
  *
  */
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/propagator.spec b/propagator.spec
index 7562eaa..250cc26 100644
--- a/propagator.spec
+++ b/propagator.spec
@@ -5,7 +5,7 @@
 
 Name: propagator
 Version: 20061123
-Release: alt1
+Release: alt1.0.glibc.1
 
 Summary: 'Early userspace' set of binaries
 License: GPL
@@ -13,7 +13,10 @@ Group: System/Kernel and hardware
 
 Source0: %name-%version.tar.bz2
 
-BuildRequires: gcc3.4 dietlibc diet-bzlib >= 20050707 diet-newt >= 20050707 diet-slang >= 20050707 mar
+BuildPreReq: mar-glibc
+
+# Automatically added by buildreq on Thu Feb 01 2007
+BuildRequires: bzlib-devel-static libnewt-devel-static libslang-devel-static
 
 %description
 %name is a set of binaries useful in 'early userspace' environment,
@@ -23,7 +26,6 @@ including init and various helpers for hw probing and bootstrapping.
 %setup -qc
 
 %build
-%set_gcc_version 3.4
 make %{?_with_shell:WITH_SHELL=t}
 
 %install
@@ -34,6 +36,9 @@ make %{?_with_shell:WITH_SHELL=t}
 %_libdir/%name
 
 %changelog
+* Fri Feb 02 2007 Nick S. Grechukh <gns@altlinux.ru> 20061123-alt1.0.glibc.1
+- accurate glibc patch, instead of published dirty hack
+
 * Thu Nov 23 2006 Sergey Bolshakov <sbolshakov@altlinux.ru> 20061123-alt1
 - added conditional shell spawning
 - fixed probing of some RAID adaptors