From 4978962da37cd7961856e48a639f0a2115025a22 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 28 Aug 2008 20:01:55 +0000 Subject: * moved hwinfo into initramfs/tools folder, as it is only being used by the initramfs * adjusted Makefile accordingly and made it keep the hwinfo folder structure when installed, too git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2120 95ad53e4-c205-0410-b2fa-d234c58c8868 --- Makefile | 5 +++-- initramfs/tools/hwinfo/bin/hwinfo-13.11 | Bin 0 -> 78772 bytes initramfs/tools/hwinfo/bin/hwinfo-14.19 | Bin 0 -> 84276 bytes initramfs/tools/hwinfo/bin/hwinfo-15.3 | Bin 0 -> 84632 bytes initramfs/tools/hwinfo/lib/libhd.so.13.11 | Bin 0 -> 2955703 bytes initramfs/tools/hwinfo/lib/libhd.so.14.19 | Bin 0 -> 3216601 bytes initramfs/tools/hwinfo/lib/libhd.so.15.3 | Bin 0 -> 3226851 bytes tools/hwinfo/bin/hwinfo-13.11 | Bin 78772 -> 0 bytes tools/hwinfo/bin/hwinfo-14.19 | Bin 84276 -> 0 bytes tools/hwinfo/bin/hwinfo-15.3 | Bin 84632 -> 0 bytes tools/hwinfo/lib/libhd.so.13.11 | Bin 2955703 -> 0 bytes tools/hwinfo/lib/libhd.so.14.19 | Bin 3216601 -> 0 bytes tools/hwinfo/lib/libhd.so.15.3 | Bin 3226851 -> 0 bytes 13 files changed, 3 insertions(+), 2 deletions(-) create mode 100755 initramfs/tools/hwinfo/bin/hwinfo-13.11 create mode 100755 initramfs/tools/hwinfo/bin/hwinfo-14.19 create mode 100755 initramfs/tools/hwinfo/bin/hwinfo-15.3 create mode 100755 initramfs/tools/hwinfo/lib/libhd.so.13.11 create mode 100755 initramfs/tools/hwinfo/lib/libhd.so.14.19 create mode 100755 initramfs/tools/hwinfo/lib/libhd.so.15.3 delete mode 100755 tools/hwinfo/bin/hwinfo-13.11 delete mode 100755 tools/hwinfo/bin/hwinfo-14.19 delete mode 100755 tools/hwinfo/bin/hwinfo-15.3 delete mode 100755 tools/hwinfo/lib/libhd.so.13.11 delete mode 100755 tools/hwinfo/lib/libhd.so.14.19 delete mode 100755 tools/hwinfo/lib/libhd.so.15.3 diff --git a/Makefile b/Makefile index e608f58a..23fd556f 100644 --- a/Makefile +++ b/Makefile @@ -187,6 +187,9 @@ supported."; \ tar --exclude=.svn -cp -C initramfs stage3-stuff/ | \ tar -xp --strip-components 1 \ -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/initramfs; \ + tar --exclude=.svn -cp -C initramfs tools | \ + tar -xp --strip-components 1 \ + -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/ramfstools; \ tar --exclude=.svn -cp -C initramfs distro-specs | \ tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share; \ tar --exclude=.svn -cp -C initramfs uclib-rootfs | \ @@ -201,8 +204,6 @@ supported."; \ $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/templates/; \ tar --exclude=.svn -cp -C installer/default_files tftpboot | \ tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share; \ - cp -a tools/hwinfo/{bin,lib}/*h* \ - $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/ramfstools; \ cp -pP tools/busybox{,.x86_64,.i586} \ $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/busybox/; \ cp -p tools/mksquashfs $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/squashfs/; \ diff --git a/initramfs/tools/hwinfo/bin/hwinfo-13.11 b/initramfs/tools/hwinfo/bin/hwinfo-13.11 new file mode 100755 index 00000000..f2ae313c Binary files /dev/null and b/initramfs/tools/hwinfo/bin/hwinfo-13.11 differ diff --git a/initramfs/tools/hwinfo/bin/hwinfo-14.19 b/initramfs/tools/hwinfo/bin/hwinfo-14.19 new file mode 100755 index 00000000..af71e25c Binary files /dev/null and b/initramfs/tools/hwinfo/bin/hwinfo-14.19 differ diff --git a/initramfs/tools/hwinfo/bin/hwinfo-15.3 b/initramfs/tools/hwinfo/bin/hwinfo-15.3 new file mode 100755 index 00000000..4f806b6e Binary files /dev/null and b/initramfs/tools/hwinfo/bin/hwinfo-15.3 differ diff --git a/initramfs/tools/hwinfo/lib/libhd.so.13.11 b/initramfs/tools/hwinfo/lib/libhd.so.13.11 new file mode 100755 index 00000000..f6fa83a6 Binary files /dev/null and b/initramfs/tools/hwinfo/lib/libhd.so.13.11 differ diff --git a/initramfs/tools/hwinfo/lib/libhd.so.14.19 b/initramfs/tools/hwinfo/lib/libhd.so.14.19 new file mode 100755 index 00000000..087e7c1e Binary files /dev/null and b/initramfs/tools/hwinfo/lib/libhd.so.14.19 differ diff --git a/initramfs/tools/hwinfo/lib/libhd.so.15.3 b/initramfs/tools/hwinfo/lib/libhd.so.15.3 new file mode 100755 index 00000000..6ab25238 Binary files /dev/null and b/initramfs/tools/hwinfo/lib/libhd.so.15.3 differ diff --git a/tools/hwinfo/bin/hwinfo-13.11 b/tools/hwinfo/bin/hwinfo-13.11 deleted file mode 100755 index f2ae313c..00000000 Binary files a/tools/hwinfo/bin/hwinfo-13.11 and /dev/null differ diff --git a/tools/hwinfo/bin/hwinfo-14.19 b/tools/hwinfo/bin/hwinfo-14.19 deleted file mode 100755 index af71e25c..00000000 Binary files a/tools/hwinfo/bin/hwinfo-14.19 and /dev/null differ diff --git a/tools/hwinfo/bin/hwinfo-15.3 b/tools/hwinfo/bin/hwinfo-15.3 deleted file mode 100755 index 4f806b6e..00000000 Binary files a/tools/hwinfo/bin/hwinfo-15.3 and /dev/null differ diff --git a/tools/hwinfo/lib/libhd.so.13.11 b/tools/hwinfo/lib/libhd.so.13.11 deleted file mode 100755 index f6fa83a6..00000000 Binary files a/tools/hwinfo/lib/libhd.so.13.11 and /dev/null differ diff --git a/tools/hwinfo/lib/libhd.so.14.19 b/tools/hwinfo/lib/libhd.so.14.19 deleted file mode 100755 index 087e7c1e..00000000 Binary files a/tools/hwinfo/lib/libhd.so.14.19 and /dev/null differ diff --git a/tools/hwinfo/lib/libhd.so.15.3 b/tools/hwinfo/lib/libhd.so.15.3 deleted file mode 100755 index 6ab25238..00000000 Binary files a/tools/hwinfo/lib/libhd.so.15.3 and /dev/null differ -- cgit v1.2.3-55-g7522