[klibc] move kinit, ipconfig and nfsmount

Sam Ravnborg sam at ravnborg.org
Sun Aug 7 01:15:34 PDT 2005


Move kinit, ipconfig and nfsmount

kinit, ipconfig and nfsmount has moved:
kinit    -> usr/kinit
ipconfig -> usr/kinit/ipconfig
nfsmount -> usr/kinit/nfsmount

ipconfig and nfsmount are subdirectories to kinit due to kinit
being dependent on these two.

The new location under usr/ reflect the desired location in the kernel,
and act as a preparation for a future kernel merge.

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>

---

Above is the changelog entry.
Due to all the file moves I have deleted most of the diffs and
only kept the part with filechanges.
It did not serve any purpose to post the full patch to the list,
wasting a lot of bandwidth.

If you want to see the full diff it is available via gitweb as soon as
the changes has mirrored out.

One could ask why utils, gzip and ash has not moved under usr/
For now I await any futher reorganisation.

Only missing pieces is now:
make clean support
Delete of unused files (mostly Makefiles)
Kconfig file to be used in kernel tree
And if someone could tell me why the install shared binaries does not
work I would be glad....

	Sam


commit 19e2ffa06ebdef2b16d3f69ca400fcfb93b32a61
tree bf97c1f14cb38719fa7cd8b13fb086dcd8f077c4
parent f0b0bb120b3104e4b7493f533e096e33cc1737cf
author Sam Ravnborg <sam at mars.(none)> Sun, 07 Aug 2005 10:06:14 +0200
committer Sam Ravnborg <sam at mars.(none)> Sun, 07 Aug 2005 10:06:14 +0200

 Kbuild                              |    3 
 Makefile                            |    2 
 cp-to-kernel.sh                     |   15 -
 ipconfig/Kbuild                     |   38 --
 ipconfig/MCONFIG                    |    8 
 ipconfig/Makefile                   |   44 --
 ipconfig/README                     |  103 -----
 ipconfig/bootp_packet.h             |   34 --
 ipconfig/bootp_proto.c              |  202 ----------
 ipconfig/bootp_proto.h              |    7 
 ipconfig/dhcp_proto.c               |  215 ----------
 ipconfig/dhcp_proto.h               |   18 -
 ipconfig/ipconfig.h                 |   31 -
 ipconfig/main.c                     |  726 -----------------------------------
 ipconfig/netdev.c                   |  243 ------------
 ipconfig/netdev.h                   |   75 ----
 ipconfig/packet.c                   |  288 --------------
 ipconfig/packet.h                   |    9 
 kinit/Kbuild                        |   31 -
 kinit/Makefile                      |   38 --
 kinit/README                        |    9 
 kinit/do_mounts.c                   |  378 ------------------
 kinit/do_mounts.h                   |   29 -
 kinit/getintfile.c                  |   33 --
 kinit/initrd.c                      |  156 --------
 kinit/kinit.c                       |  305 ---------------
 kinit/kinit.h                       |   31 -
 kinit/nfsroot.c                     |  113 -----
 kinit/open.c                        |   22 -
 kinit/readfile.c                    |   93 ----
 nfsmount/Kbuild                     |   30 -
 nfsmount/MCONFIG                    |    8 
 nfsmount/Makefile                   |   44 --
 nfsmount/README.locking             |   27 -
 nfsmount/dummypmap.c                |  146 -------
 nfsmount/dummypmap.h                |   11 -
 nfsmount/dummypmap_test.c           |    2 
 nfsmount/main.c                     |  270 -------------
 nfsmount/mount.c                    |  340 ----------------
 nfsmount/nfsmount.h                 |   34 --
 nfsmount/portmap.c                  |   73 ----
 nfsmount/sunrpc.c                   |  255 ------------
 nfsmount/sunrpc.h                   |  100 -----
 usr/kinit/Kbuild                    |   31 +
 usr/kinit/README                    |    9 
 usr/kinit/do_mounts.c               |  378 ++++++++++++++++++
 usr/kinit/do_mounts.h               |   29 +
 usr/kinit/getintfile.c              |   33 ++
 usr/kinit/initrd.c                  |  156 ++++++++
 usr/kinit/ipconfig/Kbuild           |   38 ++
 usr/kinit/ipconfig/MCONFIG          |    8 
 usr/kinit/ipconfig/README           |  103 +++++
 usr/kinit/ipconfig/bootp_packet.h   |   34 ++
 usr/kinit/ipconfig/bootp_proto.c    |  202 ++++++++++
 usr/kinit/ipconfig/bootp_proto.h    |    7 
 usr/kinit/ipconfig/bootp_proto.o    |    0 
 usr/kinit/ipconfig/dhcp_proto.c     |  215 ++++++++++
 usr/kinit/ipconfig/dhcp_proto.h     |   18 +
 usr/kinit/ipconfig/dhcp_proto.o     |    0 
 usr/kinit/ipconfig/ipconfig.h       |   31 +
 usr/kinit/ipconfig/main.c           |  726 +++++++++++++++++++++++++++++++++++
 usr/kinit/ipconfig/main.o           |    0 
 usr/kinit/ipconfig/netdev.c         |  243 ++++++++++++
 usr/kinit/ipconfig/netdev.h         |   75 ++++
 usr/kinit/ipconfig/netdev.o         |    0 
 usr/kinit/ipconfig/packet.c         |  288 ++++++++++++++
 usr/kinit/ipconfig/packet.h         |    9 
 usr/kinit/ipconfig/packet.o         |    0 
 usr/kinit/kinit.c                   |  305 +++++++++++++++
 usr/kinit/kinit.h                   |   31 +
 usr/kinit/nfsmount/Kbuild           |   30 +
 usr/kinit/nfsmount/MCONFIG          |    8 
 usr/kinit/nfsmount/README.locking   |   27 +
 usr/kinit/nfsmount/dummypmap.c      |  146 +++++++
 usr/kinit/nfsmount/dummypmap.h      |   11 +
 usr/kinit/nfsmount/dummypmap_test.c |    2 
 usr/kinit/nfsmount/main.c           |  270 +++++++++++++
 usr/kinit/nfsmount/mount.c          |  340 ++++++++++++++++
 usr/kinit/nfsmount/nfsmount.h       |   34 ++
 usr/kinit/nfsmount/portmap.c        |   73 ++++
 usr/kinit/nfsmount/sunrpc.c         |  255 ++++++++++++
 usr/kinit/nfsmount/sunrpc.h         |  100 +++++
 usr/kinit/nfsroot.c                 |  113 +++++
 usr/kinit/open.c                    |   22 +
 usr/kinit/readfile.c                |   93 ++++
 85 files changed, 4497 insertions(+), 4635 deletions(-)

diff --git a/Kbuild b/Kbuild
--- a/Kbuild
+++ b/Kbuild
@@ -7,10 +7,11 @@ always := all
 $(obj)/all:
 	$(Q)$(MAKE) $(klibc)=scripts/basic
 	$(Q)$(MAKE) $(klibc)=klibc
+	$(Q)$(MAKE) $(klibc)=usr/kinit
 	$(Q)$(MAKE) $(klibc)=ash
 	$(Q)$(MAKE) $(klibc)=utils
 	$(Q)$(MAKE) $(klibc)=gzip
 
 
 # Directories to visit during clean and install
-subdir- := klibc ash utils gzip
+subdir- := klibc ash utils gzip usr/kinit
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 VERSION := $(shell cat version)
-SUBDIRS = ipconfig nfsmount kinit
 SRCROOT = .
 
 # kbuild compatibility
@@ -86,7 +85,6 @@ klcc:
 
 klibc:
 	$(Q)$(MAKE) $(klibc)=.
-#$(Q)set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
 local-clean:
 	rm -f klibc.config klcc
diff --git a/cp-to-kernel.sh b/cp-to-kernel.sh
--- a/cp-to-kernel.sh
+++ b/cp-to-kernel.sh
@@ -38,23 +38,12 @@ if [ ! -d $kernel/usr/gzip ]; then
 fi
 cp -R gzip/* $kernel/usr/gzip
 
-echo "Copying kinit"
+echo "Copying kinit ipconfig and nfsmount"
 if [ ! -d $kernel/usr/kinit ]; then
 	mkdir -p $kernel/usr/kinit
 fi
-cp -R kinit/* $kernel/usr/kinit
+cp -R usr/kinit/* $kernel/usr/kinit
 
-echo "Copying ipconfig"
-if [ ! -d $kernel/usr/kinit/ipconfig ]; then
-	mkdir -p $kernel/usr/kinit/ipconfig
-fi
-cp -R ipconfig/* $kernel/usr/kinit/ipconfig
-
-echo "Copying nfsmount"
-if [ ! -d $kernel/usr/kinit/nfsmount ]; then
-	mkdir -p $kernel/usr/kinit/nfsmount
-fi
-cp -R nfsmount/* $kernel/usr/kinit/nfsmount
 
 echo "Copying ash"
 if [ ! -d $kernel/usr/ash ]; then



More information about the klibc mailing list