search for: ext2init

...le.am +++ b/helper/Makefile.am @@ -45,11 +45,17 @@ init_LDFLAGS = -static # http://www.doof.me.uk/2010/05/07/cute-objcopy-hack/ ELF_DEFAULT_ARCH = $(shell $(srcdir)/elf-default-arch | gawk '{ print $$1 }') DEFAULT_ARCH = $(shell $(srcdir)/elf-default-arch | gawk '{ print $$2 }') -ext2init.o: init + +CLEANFILES = ext2init.S + +ext2init.o: ext2init.S + $(CC) -o $@ -c $< + +ext2init.S: init strip --strip-all $< @file $< | grep -isq static || \ (echo "*** error: init is not staticly linked"; exit 1) - objcopy -I binary -B $(DEFAULT_ARCH) -O $(ELF_DEFAULT_ARCH)...

Document what each module does, using *.mli files. Remove the --dtb option, it's obsolete. Rename modules according to their purpose. Rich.

...kage unix,str +OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ + if !HAVE_OCAMLOPT OBJECTS = $(BOBJECTS) BEST = c +OCAMLFLAGS += -custom else OBJECTS = $(XOBJECTS) BEST = opt endif -OCAMLPACKAGES = -package unix,str -OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ - supermin_DEPENDENCIES = $(OBJECTS) ext2init-bin.o supermin_LDADD = ext2init-bin.o ../lib/libgnu.a -- 1.9.0

...le.am @@ -99,7 +99,7 @@ supermin_SOURCES = $(SOURCES_C) supermin_CFLAGS = \ -I$(shell $(OCAMLC) -where) \ $(EXT2FS_CFLAGS) $(COM_ERR_CFLAGS) \ - -I$(srcdir)/lib -I../lib + -I$(top_srcdir)/lib -I../lib BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(SOURCES_ML:.ml=.cmx) @@ -148,16 +148,16 @@ ext2init-bin.S: init strip --strip-all $< @file $< | grep -isq static || \ (echo "*** error: init is not staticly linked"; exit 1) - ./bin2s.pl $< $@ + $(srcdir)/bin2s.pl $< $@ depend: .depend -.depend: $(SOURCES) +.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_...

v1 -> v2: - If we split out the init program into a separate init/ directory, that makes it much easier to build against an alternate libc. I tried to build against uClibc, but uClibc requires an entire build chain, which looked like it was going to be a massive ballache. Rich.

...helper/bin2s.pl | 45 --- helper/checksum.c | 119 ------- helper/cpio.c | 279 ---------------- helper/ext2.c | 538 ------------------------------- helper/ext2cpio.c | 418 ------------------------ helper/ext2initrd.c | 281 ---------------- helper/ext2internal.h | 45 --- helper/helper.h | 85 ----- helper/init.c | 537 ------------------------------- helper/kernel.c | 454 -------------------------- helper/main.c...

...--git a/src/Makefile.am b/src/Makefile.am index 6261c86..5a601fe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -143,7 +143,6 @@ noinst_PROGRAMS = init init_SOURCES = init.c init_CFLAGS = -static init_LDFLAGS = -static -init_LDADD = $(ZLIB_STATIC_LIBS) $(LZMA_STATIC_LIBS) CLEANFILES += ext2init-bin.S diff --git a/src/config.ml.in b/src/config.ml.in index 42cf833..19545b6 100644 --- a/src/config.ml.in +++ b/src/config.ml.in @@ -29,12 +29,14 @@ let dpkg_deb = "@DPKG_DEB@" let dpkg_query = "@DPKG_QUERY@" let dpkg_divert = "@DPKG_DIVERT@" let fakeroot = &quo...

Allow an alternate libc, such as dietlibc, to be used for the init binary in the supermin appliance. Rich.

Joseph, Please try my modified versions of these patches. These are compile-tested on Fedora and they don't break any existing functionality, but I don't have either urpmi nor a statically-linked xz so I cannot fully test them. I have also fixed detection of zlib (2/3). Rich.

...-o febootstrap_supermin_helper-ext2cpio.o `test -f 'ext2cpio.c' || echo './'`ext2cpio.c mv -f .deps/febootstrap_supermin_helper-ext2cpio.Tpo .deps/febootstrap_supermin_helper-ext2cpio.Po gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -Wall -I../lib -g -O2 -MT febootstrap_supermin_helper-ext2initrd.o -MD -MP -MF .deps/febootstrap_supermin_helper-ext2initrd.Tpo -c -o febootstrap_supermin_helper-ext2initrd.o `test -f 'ext2initrd.c' || echo './'`ext2initrd.c mv -f .deps/febootstrap_supermin_helper-ext2initrd.Tpo .deps/febootstrap_supermin_helper-ext2initrd.Po gcc -std=gnu99 -DH...

...-o febootstrap_supermin_helper-ext2cpio.o `test -f 'ext2cpio.c' || echo './'`ext2cpio.c mv -f .deps/febootstrap_supermin_helper-ext2cpio.Tpo .deps/febootstrap_supermin_helper-ext2cpio.Po gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -Wall -I../lib -g -O2 -MT febootstrap_supermin_helper-ext2initrd.o -MD -MP -MF .deps/febootstrap_supermin_helper-ext2initrd.Tpo -c -o febootstrap_supermin_helper-ext2initrd.o `test -f 'ext2initrd.c' || echo './'`ext2initrd.c ext2initrd.c: In function ???ext2_make_initrd???: ext2initrd.c:183:10: warning: ignoring return value of ???system???, de...

Hi, this work makes supermin use the rpm library instead of invoking rpm directly. This, together with a needed refactoring of the dependency resolution, should help in make supermin faster on rpm-based systems. Surely the patches will still need polishing, especially for behaviours of newly added stuff, but at least it's a good starting point. Noting that you need rpm-devel on most of rpm

...-o febootstrap_supermin_helper-ext2cpio.o `test -f 'ext2cpio.c' || echo './'`ext2cpio.c mv -f .deps/febootstrap_supermin_helper-ext2cpio.Tpo .deps/febootstrap_supermin_helper-ext2cpio.Po gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -Wall -I../lib -g -O2 -MT febootstrap_supermin_helper-ext2initrd.o -MD -MP -MF .deps/febootstrap_supermin_helper-ext2initrd.Tpo -c -o febootstrap_supermin_helper-ext2initrd.o `test -f 'ext2initrd.c' || echo './'`ext2initrd.c mv -f .deps/febootstrap_supermin_helper-ext2initrd.Tpo .deps/febootstrap_supermin_helper-ext2initrd.Po gcc -std=gnu99 -DH...

...ng directory `/home/rjones/d/febootstrap/lib' make[2]: Leaving directory `/home/rjones/d/febootstrap/lib' Making all in helper make[2]: Entering directory `/home/rjones/d/febootstrap/helper' gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -Wall -I../lib -g -O2 -MT febootstrap_supermin_helper-ext2initrd.o -MD -MP -MF .deps/febootstrap_supermin_helper-ext2initrd.Tpo -c -o febootstrap_supermin_helper-ext2initrd.o `test -f 'ext2initrd.c' || echo './'`ext2initrd.c mv -f .deps/febootstrap_supermin_helper-ext2initrd.Tpo .deps/febootstrap_supermin_helper-ext2initrd.Po gcc -std=gnu99 -DH...

...per-kernel.Po gcc -std=gnu99 -Wall -I../lib -g -O2 -o febootstrap-supermin-helper febootstrap_supermin_helper-appliance.o febootstrap_supermin_helper-checksum.o febootstrap_supermin_helper-cpio.o febootstrap_supermin_helper-ext2.o febootstrap_supermin_helper-ext2cpio.o febootstrap_supermin_helper-ext2initrd.o febootstrap_supermin_helper-kernel.o febootstrap_supermin_helper-main.o febootstrap_supermin_helper-utils.o ext2init.o -lext2fs -lcom_err -L../lib -lgnu make[2]: Leaving directory `/home/rjones/d/febootstrap/helper' make[2]: Entering directory `/home/rjones/d/febootstrap' ocamlfind oc...

...per-kernel.Po gcc -std=gnu99 -Wall -I../lib -g -O2 -o febootstrap-supermin-helper febootstrap_supermin_helper-appliance.o febootstrap_supermin_helper-checksum.o febootstrap_supermin_helper-cpio.o febootstrap_supermin_helper-ext2.o febootstrap_supermin_helper-ext2cpio.o febootstrap_supermin_helper-ext2initrd.o febootstrap_supermin_helper-kernel.o febootstrap_supermin_helper-main.o febootstrap_supermin_helper-utils.o ext2init.o -lext2fs -lcom_err -L../lib -lgnu make[2]: Leaving directory `/home/rjones/d/febootstrap/helper' make[2]: Entering directory `/home/rjones/d/febootstrap' ocamlfind oc...