diff options
| author | Dirk von Suchodoletz | 2007-01-10 16:08:43 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-01-10 16:08:43 +0100 |
| commit | 39542a6836ce2abd85a8df04af4229c888a71956 (patch) | |
| tree | 0434e55a09b44a5fec2de55bfbdf3fa5da7644e2 /Makefile | |
| parent | As our original filename does not end with .rpm we have to check if this (diff) | |
| download | core-39542a6836ce2abd85a8df04af4229c888a71956.tar.gz core-39542a6836ce2abd85a8df04af4229c888a71956.tar.xz core-39542a6836ce2abd85a8df04af4229c888a71956.zip | |
Busybox is now properly named for the two supported architectures: i386
and x86_64. mkdxsinitrd includes usb keyboard stuff per default and init
loads the modules rather early (otherwise on non-legacy machines
debugging might be difficult)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@609 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -122,10 +122,10 @@ supported."; \ -p $(SLX_TFTPBOOT_PATH) \ -p $(SLX_SHARE_PATH)/themes @# copy license - @cp COPYING $(SLX_BASE_PATH) + @cp COPYING $(SLX_BASE_PATH)/ @# copy initramfs generator scripts (and inject SLX_CONFIG_PATH on the way): - @cp ./initramfs/mkdxsinitrd $(SLX_BIN_PATH) - @cp ./initramfs/slxmkramfs $(SLX_BIN_PATH) + @cp ./initramfs/mkdxsinitrd $(SLX_BIN_PATH)/ + @cp ./initramfs/slxmkramfs $(SLX_BIN_PATH)/ @sed -e "s,@@@SLX_CONFIG_PATH@@@,$(SLX_CONFIG_PATH)," \ -i $(SLX_BIN_PATH)/mkdxsinitrd @sed -e "s,@@@SLX_CONFIG_PATH@@@,$(SLX_CONFIG_PATH)," \ @@ -146,13 +146,12 @@ supported."; \ @tar --exclude=.svn -cp -C initramfs distro-specs | \ tar -xp -C $(SLX_SHARE_PATH) @cp -a installer/default_files/machine-setup.default \ - $(SLX_SHARE_PATH)/templates + $(SLX_SHARE_PATH)/templates/ @tar --exclude=.svn -cp -C installer/default_files tftpboot | \ tar -xp -C $(SLX_SHARE_PATH) @cd theming; tar --exclude=.svn -cp * | \ tar -xp -C $(SLX_SHARE_PATH)/themes; cd .. - @# ia32 busybox should be renamed accordingly ... - @cp -p tools/busybox{,.links,.x86_64} installer/slxbootstrap \ + @cp -p tools/busybox{,.links,.x86_64,.i386} installer/slxbootstrap \ $(SLX_SHARE_PATH)/busybox/ @# create pre-/postinit scripts for us in initramfs: |