summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Tappe2008-08-28 22:01:55 +0200
committerOliver Tappe2008-08-28 22:01:55 +0200
commit4978962da37cd7961856e48a639f0a2115025a22 (patch)
tree194e75822b537abd485c7fc92db70e30c4f690f2
parentRemove copying of deprecated tools, add hwinfo stuff to ~/ramfstools. (diff)
downloadcore-4978962da37cd7961856e48a639f0a2115025a22.tar.gz
core-4978962da37cd7961856e48a639f0a2115025a22.tar.xz
core-4978962da37cd7961856e48a639f0a2115025a22.zip
* 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
-rw-r--r--Makefile5
-rwxr-xr-xinitramfs/tools/hwinfo/bin/hwinfo-13.11 (renamed from tools/hwinfo/bin/hwinfo-13.11)bin78772 -> 78772 bytes
-rwxr-xr-xinitramfs/tools/hwinfo/bin/hwinfo-14.19 (renamed from tools/hwinfo/bin/hwinfo-14.19)bin84276 -> 84276 bytes
-rwxr-xr-xinitramfs/tools/hwinfo/bin/hwinfo-15.3 (renamed from tools/hwinfo/bin/hwinfo-15.3)bin84632 -> 84632 bytes
-rwxr-xr-xinitramfs/tools/hwinfo/lib/libhd.so.13.11 (renamed from tools/hwinfo/lib/libhd.so.13.11)bin2955703 -> 2955703 bytes
-rwxr-xr-xinitramfs/tools/hwinfo/lib/libhd.so.14.19 (renamed from tools/hwinfo/lib/libhd.so.14.19)bin3216601 -> 3216601 bytes
-rwxr-xr-xinitramfs/tools/hwinfo/lib/libhd.so.15.3 (renamed from tools/hwinfo/lib/libhd.so.15.3)bin3226851 -> 3226851 bytes
7 files changed, 3 insertions, 2 deletions
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/tools/hwinfo/bin/hwinfo-13.11 b/initramfs/tools/hwinfo/bin/hwinfo-13.11
index f2ae313c..f2ae313c 100755
--- a/tools/hwinfo/bin/hwinfo-13.11
+++ b/initramfs/tools/hwinfo/bin/hwinfo-13.11
Binary files differ
diff --git a/tools/hwinfo/bin/hwinfo-14.19 b/initramfs/tools/hwinfo/bin/hwinfo-14.19
index af71e25c..af71e25c 100755
--- a/tools/hwinfo/bin/hwinfo-14.19
+++ b/initramfs/tools/hwinfo/bin/hwinfo-14.19
Binary files differ
diff --git a/tools/hwinfo/bin/hwinfo-15.3 b/initramfs/tools/hwinfo/bin/hwinfo-15.3
index 4f806b6e..4f806b6e 100755
--- a/tools/hwinfo/bin/hwinfo-15.3
+++ b/initramfs/tools/hwinfo/bin/hwinfo-15.3
Binary files differ
diff --git a/tools/hwinfo/lib/libhd.so.13.11 b/initramfs/tools/hwinfo/lib/libhd.so.13.11
index f6fa83a6..f6fa83a6 100755
--- a/tools/hwinfo/lib/libhd.so.13.11
+++ b/initramfs/tools/hwinfo/lib/libhd.so.13.11
Binary files differ
diff --git a/tools/hwinfo/lib/libhd.so.14.19 b/initramfs/tools/hwinfo/lib/libhd.so.14.19
index 087e7c1e..087e7c1e 100755
--- a/tools/hwinfo/lib/libhd.so.14.19
+++ b/initramfs/tools/hwinfo/lib/libhd.so.14.19
Binary files differ
diff --git a/tools/hwinfo/lib/libhd.so.15.3 b/initramfs/tools/hwinfo/lib/libhd.so.15.3
index 6ab25238..6ab25238 100755
--- a/tools/hwinfo/lib/libhd.so.15.3
+++ b/initramfs/tools/hwinfo/lib/libhd.so.15.3
Binary files differ