diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 191e5c9..d4f1f67 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -63,7 +63,6 @@ jobs: wget http://mirror.slitaz.org/iso/rolling/slitaz-rolling-core64.iso mkdir iso-old 7z x slitaz-rolling-core64.iso -y -r -o./iso-old - wget http://www.ecoo.top:8083/dl/slitaz/iso/rolling/slitaz5-core64-cn-with-docker.iso wget -O ./packages/teasiu-5.0.tazpkg http://www.ecoo.top:8083/dl/slitaz/teasiu-5.0.tazpkg wget -O ./packages/updatetime.txt http://www.ecoo.top:8083/dl/slitaz/iso/rolling/slitaz-rolling-core64-chinese-updatetime.txt @@ -73,6 +72,12 @@ jobs: wget http://mirror.slitaz.org/iso/rolling/slitaz-rolling-core.iso mkdir iso-old32 7z x slitaz-rolling-core.iso -y -r -o./iso-old32 + + - name: download iso64 and unzip iso64 for dockerd + run: | + wget http://mirror.slitaz.org/iso/rolling/slitaz-rolling-core64.iso + mkdir iso-old64 + 7z x slitaz-rolling-core64.iso -y -r -o./iso-old64 - name: docker build a new rootfs64 run: | @@ -97,12 +102,23 @@ jobs: cd ./iso32 sh iso.sh + - name: docker build a new rootfs64d + run: | + docker build -t newrootfs64d -f ./dockerfile-rootfs64d . + + - name: copy rootfs64d.gz outside of docker + run: | + docker run --name myrootfs64 newrootfs64d + docker cp myrootfs64:/tmp/rootfs-new.gz ./iso64d/mkiso/rootfs.gz + cd ./iso64d + sh iso.sh + - name: Prepare artifact run: | mkdir -p slitaz-artifact cp -a ./slitaz5.0-rolling-core64-cn.iso slitaz-artifact/ cp -a ./slitaz5.0-rolling-core32-cn.iso slitaz-artifact/ - cp -a ./slitaz5-core64-cn-with-docker.iso slitaz-artifact/ + cp -a ./slitaz5.0-rolling-core64-cn-docker.iso slitaz-artifact/ - name: upload to artifact uses: actions/upload-artifact@v2 diff --git a/dockerfile-rootfs64d b/dockerfile-rootfs64d new file mode 100644 index 0000000..d77eb44 --- /dev/null +++ b/dockerfile-rootfs64d @@ -0,0 +1,14 @@ +FROM slitazcn/slitaz-5.0-base +COPY ./iso-old64/boot/rootfs.gz ./packages/* ./ +RUN mkdir -p /tmp/rootfs && \ + ls -l && \ + mv rootfs.gz /tmp/rootfs && \ + cd /tmp/rootfs && \ + (zcat rootfs.gz 2>/dev/null || lzma d rootfs.gz -so) | cpio -id && \ + rm rootfs.gz && \ + cd / && \ + sh /gen-slitaz64d.sh && \ + cd /tmp/rootfs && \ + ls -l && \ + find . -print | cpio -o -H newc | lzma e -si -so > ../rootfs-new.gz + diff --git a/iso32/mkiso/bzImage b/iso32/mkiso/bzImage index 2f7f3a9..6d1d50b 100644 Binary files a/iso32/mkiso/bzImage and b/iso32/mkiso/bzImage differ diff --git a/iso64/mkiso/vmlinuz-3.16.55-slitaz64 b/iso64/mkiso/vmlinuz-3.16.55-slitaz64 index 894e203..b0c4793 100644 Binary files a/iso64/mkiso/vmlinuz-3.16.55-slitaz64 and b/iso64/mkiso/vmlinuz-3.16.55-slitaz64 differ diff --git a/iso64d/iso.sh b/iso64d/iso.sh new file mode 100755 index 0000000..c52e764 --- /dev/null +++ b/iso64d/iso.sh @@ -0,0 +1,4 @@ +#!/bin/sh +genisoimage -r -T -J -V "Slitaz_ISO" -b winly.bin -c boot.cat -no-emul-boot -boot-load-size 4 \ + -boot-info-table -eltorito-alt-boot -e efiboot.img -no-emul-boot -v -o ../slitaz5.0-rolling-core64-cn-docker.iso ./mkiso + diff --git a/iso64d/mkiso/efi/boot/bootx64.efi b/iso64d/mkiso/efi/boot/bootx64.efi new file mode 100644 index 0000000..e87e112 Binary files /dev/null and b/iso64d/mkiso/efi/boot/bootx64.efi differ diff --git a/iso64d/mkiso/efiboot.img b/iso64d/mkiso/efiboot.img new file mode 100644 index 0000000..40892c5 Binary files /dev/null and b/iso64d/mkiso/efiboot.img differ diff --git a/iso64d/mkiso/ipxe.lkrn b/iso64d/mkiso/ipxe.lkrn new file mode 100644 index 0000000..fbb7ea4 Binary files /dev/null and b/iso64d/mkiso/ipxe.lkrn differ diff --git a/iso64d/mkiso/vmlinuz-3.16.55-slitaz64 b/iso64d/mkiso/vmlinuz-3.16.55-slitaz64 new file mode 100644 index 0000000..b0c4793 Binary files /dev/null and b/iso64d/mkiso/vmlinuz-3.16.55-slitaz64 differ diff --git a/iso64d/mkiso/winly.bin b/iso64d/mkiso/winly.bin new file mode 100644 index 0000000..cff41c8 Binary files /dev/null and b/iso64d/mkiso/winly.bin differ diff --git a/iso64d/mkiso/winly/slitaz.jpg b/iso64d/mkiso/winly/slitaz.jpg new file mode 100644 index 0000000..e7cf837 Binary files /dev/null and b/iso64d/mkiso/winly/slitaz.jpg differ diff --git a/iso64d/mkiso/winly/themes/winly/TRANS.TBL b/iso64d/mkiso/winly/themes/winly/TRANS.TBL new file mode 100644 index 0000000..f52c986 --- /dev/null +++ b/iso64d/mkiso/winly/themes/winly/TRANS.TBL @@ -0,0 +1,33 @@ +F BOOT_000.PNG;1 boot_menu_c.png +F BOOT_001.PNG;1 boot_menu_nw.png +F BOOT_002.PNG;1 boot_menu_w.png +F BOOT_003.PNG;1 boot_menu_ne.png +F BOOT_004.PNG;1 boot_menu_sw.png +F BOOT_005.PNG;1 boot_menu_n.png +F BOOT_006.PNG;1 boot_menu_e.png +F BOOT_007.PNG;1 boot_menu_s.png +F BOOT_MEN.PNG;1 boot_menu_se.png +F DEJAV000.PF2;1 dejavu-sans-bold-14.pf2 +F DEJAV001.PF2;1 dejavu-sans-12.pf2 +F DEJAVU_S.PF2;1 dejavu-sans-10.pf2 +D ICONS icons +F PROGR000.PNG;1 progress_c.png +F PROGR001.PNG;1 progress_highlight_c.png +F PROGR002.PNG;1 progress_highlight_w.png +F PROGRESS.PNG;1 progress_highlight_e.png +F SELECT_C.PNG;1 select_c.png +F SELECT_E.PNG;1 select_e.png +F SELECT_W.PNG;1 select_w.png +F SLIDER_C.PNG;1 slider_c.png +F SLITAZ4C.PNG;1 slitaz4cn.png +F TERMI000.PNG;1 terminal_c.png +F TERMI001.PNG;1 terminal_w.png +F TERMI002.PNG;1 terminal_sw.png +F TERMI003.PNG;1 terminal_se.png +F TERMI004.PNG;1 terminal_ne.png +F TERMI005.PNG;1 terminal_s.png +F TERMI006.PNG;1 terminal_n.png +F TERMI007.PNG;1 terminal_e.png +F TERMINAL.PNG;1 terminal_nw.png +F THEME.TXT;1 theme.txt +F WALLPAPE.PNG;1 wallpaper.png diff --git a/iso64d/mkiso/winly/themes/winly/boot_menu_c.png b/iso64d/mkiso/winly/themes/winly/boot_menu_c.png new file mode 100644 index 0000000..f0b199e Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/boot_menu_c.png differ diff --git a/iso64d/mkiso/winly/themes/winly/boot_menu_e.png b/iso64d/mkiso/winly/themes/winly/boot_menu_e.png new file mode 100644 index 0000000..2315cd1 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/boot_menu_e.png differ diff --git a/iso64d/mkiso/winly/themes/winly/boot_menu_n.png b/iso64d/mkiso/winly/themes/winly/boot_menu_n.png new file mode 100644 index 0000000..82325b3 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/boot_menu_n.png differ diff --git a/iso64d/mkiso/winly/themes/winly/boot_menu_ne.png b/iso64d/mkiso/winly/themes/winly/boot_menu_ne.png new file mode 100644 index 0000000..583b8f7 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/boot_menu_ne.png differ diff --git a/iso64d/mkiso/winly/themes/winly/boot_menu_nw.png b/iso64d/mkiso/winly/themes/winly/boot_menu_nw.png new file mode 100644 index 0000000..2446b1b Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/boot_menu_nw.png differ diff --git a/iso64d/mkiso/winly/themes/winly/boot_menu_s.png b/iso64d/mkiso/winly/themes/winly/boot_menu_s.png new file mode 100644 index 0000000..1069d9c Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/boot_menu_s.png differ diff --git a/iso64d/mkiso/winly/themes/winly/boot_menu_se.png b/iso64d/mkiso/winly/themes/winly/boot_menu_se.png new file mode 100644 index 0000000..c0d854e Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/boot_menu_se.png differ diff --git a/iso64d/mkiso/winly/themes/winly/boot_menu_sw.png b/iso64d/mkiso/winly/themes/winly/boot_menu_sw.png new file mode 100644 index 0000000..3981645 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/boot_menu_sw.png differ diff --git a/iso64d/mkiso/winly/themes/winly/boot_menu_w.png b/iso64d/mkiso/winly/themes/winly/boot_menu_w.png new file mode 100644 index 0000000..35dd064 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/boot_menu_w.png differ diff --git a/iso64d/mkiso/winly/themes/winly/dejavu-sans-10.pf2 b/iso64d/mkiso/winly/themes/winly/dejavu-sans-10.pf2 new file mode 100644 index 0000000..8d91b1c Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/dejavu-sans-10.pf2 differ diff --git a/iso64d/mkiso/winly/themes/winly/dejavu-sans-12.pf2 b/iso64d/mkiso/winly/themes/winly/dejavu-sans-12.pf2 new file mode 100644 index 0000000..54b2bca Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/dejavu-sans-12.pf2 differ diff --git a/iso64d/mkiso/winly/themes/winly/dejavu-sans-bold-14.pf2 b/iso64d/mkiso/winly/themes/winly/dejavu-sans-bold-14.pf2 new file mode 100644 index 0000000..8db4006 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/dejavu-sans-bold-14.pf2 differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/.directory b/iso64d/mkiso/winly/themes/winly/icons/.directory new file mode 100644 index 0000000..6f2bae2 --- /dev/null +++ b/iso64d/mkiso/winly/themes/winly/icons/.directory @@ -0,0 +1,4 @@ +[Dolphin] +PreviewsShown=true +Timestamp=2012,10,28,1,37,37 +Version=3 diff --git a/iso64d/mkiso/winly/themes/winly/icons/TRANS.TBL b/iso64d/mkiso/winly/themes/winly/icons/TRANS.TBL new file mode 100644 index 0000000..a42e9e5 --- /dev/null +++ b/iso64d/mkiso/winly/themes/winly/icons/TRANS.TBL @@ -0,0 +1,20 @@ +F ARCH.PNG;1 arch.png +F DEBIAN.PNG;1 debian.png +F FEDORA.PNG;1 fedora.png +F GENTOO.PNG;1 gentoo.png +F GNU_LINU.PNG;1 gnu-linux.png +F KUBUNTU.PNG;1 kubuntu.png +F LINUXMIN.PNG;1 linuxmint.png +F LUBUNTU.PNG;1 lubuntu.png +F MANDRIVA.PNG;1 mandrivalinux.png +F OPENSUSE.PNG;1 opensuse.png +F OSX.PNG;1 osx.png +F RECOVERY.PNG;1 recovery.png +F SABAYON.PNG;1 sabayon.png +F SLACKWAR.PNG;1 slackware.png +F SLITAZ.PNG;1 slitaz.png +F SUBMENU.PNG;1 submenu.png +F UBUNTU.PNG;1 ubuntu.png +F WINDOWS.PNG;1 windows.png +F XUBUNTU.PNG;1 xubuntu.png +F _DIRECTO.;1 .directory diff --git a/iso64d/mkiso/winly/themes/winly/icons/arch.png b/iso64d/mkiso/winly/themes/winly/icons/arch.png new file mode 100644 index 0000000..fbd0131 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/arch.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/debian.png b/iso64d/mkiso/winly/themes/winly/icons/debian.png new file mode 100644 index 0000000..962790b Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/debian.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/fedora.png b/iso64d/mkiso/winly/themes/winly/icons/fedora.png new file mode 100644 index 0000000..cccdff8 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/fedora.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/gentoo.png b/iso64d/mkiso/winly/themes/winly/icons/gentoo.png new file mode 100644 index 0000000..9bbe4d8 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/gentoo.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/gnu-linux.png b/iso64d/mkiso/winly/themes/winly/icons/gnu-linux.png new file mode 100644 index 0000000..6db4ad1 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/gnu-linux.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/kubuntu.png b/iso64d/mkiso/winly/themes/winly/icons/kubuntu.png new file mode 100644 index 0000000..b545b87 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/kubuntu.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/linuxmint.png b/iso64d/mkiso/winly/themes/winly/icons/linuxmint.png new file mode 100644 index 0000000..ff5dd1f Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/linuxmint.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/lubuntu.png b/iso64d/mkiso/winly/themes/winly/icons/lubuntu.png new file mode 100644 index 0000000..4320746 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/lubuntu.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/mandrivalinux.png b/iso64d/mkiso/winly/themes/winly/icons/mandrivalinux.png new file mode 100644 index 0000000..d86b87d Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/mandrivalinux.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/opensuse.png b/iso64d/mkiso/winly/themes/winly/icons/opensuse.png new file mode 100644 index 0000000..5dfb35a Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/opensuse.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/osx.png b/iso64d/mkiso/winly/themes/winly/icons/osx.png new file mode 100644 index 0000000..6bf9651 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/osx.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/recovery.png b/iso64d/mkiso/winly/themes/winly/icons/recovery.png new file mode 100644 index 0000000..5d53e8b Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/recovery.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/sabayon.png b/iso64d/mkiso/winly/themes/winly/icons/sabayon.png new file mode 100644 index 0000000..602c66b Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/sabayon.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/slackware.png b/iso64d/mkiso/winly/themes/winly/icons/slackware.png new file mode 100644 index 0000000..e8bbcc8 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/slackware.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/slitaz.png b/iso64d/mkiso/winly/themes/winly/icons/slitaz.png new file mode 100644 index 0000000..fbf01e6 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/slitaz.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/submenu.png b/iso64d/mkiso/winly/themes/winly/icons/submenu.png new file mode 100644 index 0000000..ef30aa9 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/submenu.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/ubuntu.png b/iso64d/mkiso/winly/themes/winly/icons/ubuntu.png new file mode 100644 index 0000000..7484308 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/ubuntu.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/windows.png b/iso64d/mkiso/winly/themes/winly/icons/windows.png new file mode 100644 index 0000000..22b42a4 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/windows.png differ diff --git a/iso64d/mkiso/winly/themes/winly/icons/xubuntu.png b/iso64d/mkiso/winly/themes/winly/icons/xubuntu.png new file mode 100644 index 0000000..7ef5bef Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/icons/xubuntu.png differ diff --git a/iso64d/mkiso/winly/themes/winly/progress_c.png b/iso64d/mkiso/winly/themes/winly/progress_c.png new file mode 100644 index 0000000..a350b18 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/progress_c.png differ diff --git a/iso64d/mkiso/winly/themes/winly/progress_highlight_c.png b/iso64d/mkiso/winly/themes/winly/progress_highlight_c.png new file mode 100644 index 0000000..22c86e4 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/progress_highlight_c.png differ diff --git a/iso64d/mkiso/winly/themes/winly/progress_highlight_e.png b/iso64d/mkiso/winly/themes/winly/progress_highlight_e.png new file mode 100644 index 0000000..12e60ff Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/progress_highlight_e.png differ diff --git a/iso64d/mkiso/winly/themes/winly/progress_highlight_w.png b/iso64d/mkiso/winly/themes/winly/progress_highlight_w.png new file mode 100644 index 0000000..0876e1e Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/progress_highlight_w.png differ diff --git a/iso64d/mkiso/winly/themes/winly/select_c.png b/iso64d/mkiso/winly/themes/winly/select_c.png new file mode 100644 index 0000000..b6ce5c8 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/select_c.png differ diff --git a/iso64d/mkiso/winly/themes/winly/select_e.png b/iso64d/mkiso/winly/themes/winly/select_e.png new file mode 100644 index 0000000..2030242 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/select_e.png differ diff --git a/iso64d/mkiso/winly/themes/winly/select_w.png b/iso64d/mkiso/winly/themes/winly/select_w.png new file mode 100644 index 0000000..1eb5022 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/select_w.png differ diff --git a/iso64d/mkiso/winly/themes/winly/slider_c.png b/iso64d/mkiso/winly/themes/winly/slider_c.png new file mode 100644 index 0000000..a81b60c Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/slider_c.png differ diff --git a/iso64d/mkiso/winly/themes/winly/slitaz4cn.png b/iso64d/mkiso/winly/themes/winly/slitaz4cn.png new file mode 100644 index 0000000..97d6c46 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/slitaz4cn.png differ diff --git a/iso64d/mkiso/winly/themes/winly/terminal_c.png b/iso64d/mkiso/winly/themes/winly/terminal_c.png new file mode 100644 index 0000000..00f7c08 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/terminal_c.png differ diff --git a/iso64d/mkiso/winly/themes/winly/terminal_e.png b/iso64d/mkiso/winly/themes/winly/terminal_e.png new file mode 100644 index 0000000..09fe19f Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/terminal_e.png differ diff --git a/iso64d/mkiso/winly/themes/winly/terminal_n.png b/iso64d/mkiso/winly/themes/winly/terminal_n.png new file mode 100644 index 0000000..2af622b Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/terminal_n.png differ diff --git a/iso64d/mkiso/winly/themes/winly/terminal_ne.png b/iso64d/mkiso/winly/themes/winly/terminal_ne.png new file mode 100644 index 0000000..5b6a475 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/terminal_ne.png differ diff --git a/iso64d/mkiso/winly/themes/winly/terminal_nw.png b/iso64d/mkiso/winly/themes/winly/terminal_nw.png new file mode 100644 index 0000000..1563fc0 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/terminal_nw.png differ diff --git a/iso64d/mkiso/winly/themes/winly/terminal_s.png b/iso64d/mkiso/winly/themes/winly/terminal_s.png new file mode 100644 index 0000000..1428617 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/terminal_s.png differ diff --git a/iso64d/mkiso/winly/themes/winly/terminal_se.png b/iso64d/mkiso/winly/themes/winly/terminal_se.png new file mode 100644 index 0000000..ff94d16 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/terminal_se.png differ diff --git a/iso64d/mkiso/winly/themes/winly/terminal_sw.png b/iso64d/mkiso/winly/themes/winly/terminal_sw.png new file mode 100644 index 0000000..d08a55a Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/terminal_sw.png differ diff --git a/iso64d/mkiso/winly/themes/winly/terminal_w.png b/iso64d/mkiso/winly/themes/winly/terminal_w.png new file mode 100644 index 0000000..3c5b847 Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/terminal_w.png differ diff --git a/iso64d/mkiso/winly/themes/winly/theme.txt b/iso64d/mkiso/winly/themes/winly/theme.txt new file mode 100644 index 0000000..44f0f95 --- /dev/null +++ b/iso64d/mkiso/winly/themes/winly/theme.txt @@ -0,0 +1,59 @@ +# Ubuntu 13.04 GRUB2 theme + +desktop-image: "wallpaper.png" +title-text: "" +terminal-box: "terminal_*.png" +#terminal-font: "Gnu Unifont Mono Regular 16" + ++ boot_menu { + left = 24%-5 + width = 55%+11 + top = 22%-5 + height = 55%+21 + menu_pixmap_style = "boot_menu_*.png" + item_font = "DejaVu Sans Bold 14" + item_color = "#000000" + item_height = 48 + item_icon_space = 8 + item_spacing = 2 + selected_item_font = "DejaVu Sans Bold 14" + selected_item_color= "#FFFFFF" + selected_item_pixmap_style = "select_*.png" + icon_height = 48 + icon_width = 48 + icon_spacing = 25 + scrollbar = true + scrollbar_width = 3 + scrollbar_thumb = "slider_*.png" +} + ++ progress_bar { + id = "__timeout__" + left = 20% + top = 80%+15 + height = 20 + width = 65% + font = "DejaVu Sans Regular 12" + text_color = "#333333" + text = "默认选项系统将在 %d 秒后启动，按任意键可终止..." + bar_style = "progress_*.png" + highlight_style = "progress_highlight_*.png" +} + +# The Ubuntu 13.04/Raring Ringtail logo image. ++ image { + top = 100%-140 + left = 100%-350 + width = 350 + hight = 140 + file = "slitaz4cn.png" +} + +# The navigation instructions ++ vbox { + left = 5% + top = 90% + + label { text = "- 按上下键选择高亮菜单,按回车键启动" color = "#ADA9A5" font = "DejaVu Sans Regular 12" } + + label { text = "- 按 'e' 键编辑所选菜单的命令行" color = "#ADA9A5" font = "DejaVu Sans Regular 12" } + + label { text = "- 按 'c' 进入程序命令行" color = "#ADA9A5" font = "DejaVu Sans Regular 12" } +} diff --git a/iso64d/mkiso/winly/themes/winly/wallpaper.png b/iso64d/mkiso/winly/themes/winly/wallpaper.png new file mode 100644 index 0000000..ba79dda Binary files /dev/null and b/iso64d/mkiso/winly/themes/winly/wallpaper.png differ diff --git a/iso64d/mkiso/winly/unicode.pf2 b/iso64d/mkiso/winly/unicode.pf2 new file mode 100644 index 0000000..57b682a Binary files /dev/null and b/iso64d/mkiso/winly/unicode.pf2 differ diff --git a/iso64d/mkiso/winly/winly.cfg b/iso64d/mkiso/winly/winly.cfg new file mode 100644 index 0000000..b4dc761 --- /dev/null +++ b/iso64d/mkiso/winly/winly.cfg @@ -0,0 +1,39 @@ +set timeout=10 + +insmod gfxmenu +insmod jpeg +if background_image /winly/slitaz.jpg; then + true +else + set menu_color_normal=white/black + set menu_color_highlight=black/light-gray + if background_color 44,0,30; then + clear + fi +fi +insmod gfxmenu +insmod png +set theme=/winly/themes/winly/theme.txt +export theme +########## +########## +menuentry "slitaz5微型linux中文定制版" --class slitaz --class os { +linux /vmlinuz-3.16.55-slitaz64 rw root=/dev/null vga=normal lang=zh_CN kmap=us tz=Asia/Shanghai autologin +initrd /rootfs.gz +} +if [ -e $prefix/i386-pc/ntldr.mod ]; then +menuentry "BIOS网络启动slitaz5微型linux中文定制版" --class slitaz --class os { +linux16 /ipxe.lkrn +} + +else +menuentry "UEFI网络启动slitaz5微型linux中文定制版" --class slitaz --class os { +chainloader /ipxe.efi chain file:/efimenu.ipxe +} +fi +menuentry "【reboot】重启" --class windows --class os{ + reboot +} +menuentry "【halt】关闭计算机" --class windows --class os{ + halt +} diff --git a/iso64d/mkiso/winlyldr b/iso64d/mkiso/winlyldr new file mode 100644 index 0000000..cc49ce1 Binary files /dev/null and b/iso64d/mkiso/winlyldr differ diff --git a/packages/dockerd.tazpkg b/packages/dockerd.tazpkg new file mode 100644 index 0000000..6945adc Binary files /dev/null and b/packages/dockerd.tazpkg differ diff --git a/packages/gen-slitaz32.sh b/packages/gen-slitaz32.sh index f99b379..f19debe 100644 --- a/packages/gen-slitaz32.sh +++ b/packages/gen-slitaz32.sh @@ -1,5 +1,6 @@ #!/bin/sh ROOTFS="/tmp/rootfs" +tazpkg install linux-3.16.55.tazpkg --root=$ROOTFS --nodeps --local --forced tazpkg install yong-2.5.0.tazpkg --root=$ROOTFS --nodeps --local tazpkg install sudocn-1.8.4.tazpkg --root=$ROOTFS --nodeps --local tazpkg install ghost-5.0.1.tazpkg --root=$ROOTFS --nodeps --local @@ -35,9 +36,9 @@ tazpkg install dosfstools*.tazpkg --root=$ROOTFS --nodeps --local tazpkg install mdadm*.tazpkg --root=$ROOTFS --nodeps --local tazpkg install grsync*.tazpkg --root=$ROOTFS --local tazpkg install axel*.tazpkg --root=$ROOTFS --nodeps --local -tazpkg get xorg-xf86-video-geode xorg-xf86-video-ati xorg-xf86-video-nouveau xorg-xf86-video-intel xorg-xf86-video-radeonhd xorg-xf86-video-nv -tazpkg install xorg-xf86-video*.tazpkg --root=$ROOTFS --local -tazpkg -gi openvpn --root=$ROOTFS --local +#tazpkg get xorg-xf86-video-geode xorg-xf86-video-ati xorg-xf86-video-nouveau xorg-xf86-video-intel xorg-xf86-video-radeonhd xorg-xf86-video-nv +#tazpkg install xorg-xf86-video*.tazpkg --root=$ROOTFS --local +#tazpkg -gi openvpn --root=$ROOTFS --local tazpkg -gi linux64-video --root=$ROOTFS --local tazpkg -gi linux64-cifs --root=$ROOTFS --local tazpkg -gi linux64-acpi --root=$ROOTFS --local diff --git a/packages/gen-slitaz64.sh b/packages/gen-slitaz64.sh index ec72a1b..69876b4 100644 --- a/packages/gen-slitaz64.sh +++ b/packages/gen-slitaz64.sh @@ -36,9 +36,9 @@ tazpkg install dosfstools*.tazpkg --root=$ROOTFS --nodeps --local tazpkg install mdadm*.tazpkg --root=$ROOTFS --nodeps --local tazpkg install grsync*.tazpkg --root=$ROOTFS --local tazpkg install axel*.tazpkg --root=$ROOTFS --nodeps --local -tazpkg get xorg-xf86-video-geode xorg-xf86-video-ati xorg-xf86-video-nouveau xorg-xf86-video-intel xorg-xf86-video-radeonhd xorg-xf86-video-nv -tazpkg install xorg-xf86-video*.tazpkg --root=$ROOTFS --local -tazpkg -gi openvpn --root=$ROOTFS --local +#tazpkg get xorg-xf86-video-geode xorg-xf86-video-ati xorg-xf86-video-nouveau xorg-xf86-video-intel xorg-xf86-video-radeonhd xorg-xf86-video-nv +#tazpkg install xorg-xf86-video*.tazpkg --root=$ROOTFS --local +#tazpkg -gi openvpn --root=$ROOTFS --local tazpkg -gi linux64-video --root=$ROOTFS --local tazpkg -gi linux64-cifs --root=$ROOTFS --local tazpkg -gi linux64-acpi --root=$ROOTFS --local diff --git a/packages/gen-slitaz64d.sh b/packages/gen-slitaz64d.sh new file mode 100644 index 0000000..52f5544 --- /dev/null +++ b/packages/gen-slitaz64d.sh @@ -0,0 +1,109 @@ +#!/bin/sh +ROOTFS="/tmp/rootfs" +tazpkg install linux64-3.16.55.tazpkg --root=$ROOTFS --nodeps --local --forced +tazpkg install yong-2.5.0.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install sudocn-1.8.4.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install ghost-5.0.1.tazpkg --root=$ROOTFS --nodeps --local +tazpkg get wqy-microhei xz tar curl git xorg-xf86-input-vmmouse grsync +tazpkg install wqy-microhei*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install xz*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install tar*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install curl*.tazpkg --root=$ROOTFS --local +tazpkg install git*.tazpkg --root=$ROOTFS --local +tazpkg get locale-zh_CN locale-zh_CN-extra bash iptables linux64-netfilter isomaster gvfs-smb dosfstools mdadm +tazpkg get exfat-utils gftp xorg-xf86-video-vmware p7zip-full zip unzip cpio gzip transmission-daemon libevent axel +tazpkg install locale-zh_CN*.tazpkg --root=$ROOTFS --nodeps --local +yes | tazpkg install bash*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install linux64-netfilter*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install iptables*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install exfat-utils*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install gftp*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install xorg-xf86-video-vmware*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install xorg-xf86-input-vmmouse*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install p7zip-full*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install zip*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install unzip*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install cpio*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install gzip*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install rar*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install xarchiver*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install libevent*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install transmission-daemon*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install isomaster*.tazpkg --root=$ROOTFS --local +tazpkg install gvfs-smb*.tazpkg --root=$ROOTFS --local +tazpkg install transmission-web-contrl-1.61.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install dosfstools*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install mdadm*.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install grsync*.tazpkg --root=$ROOTFS --local +tazpkg install axel*.tazpkg --root=$ROOTFS --nodeps --local +#tazpkg get xorg-xf86-video-geode xorg-xf86-video-ati xorg-xf86-video-nouveau xorg-xf86-video-intel xorg-xf86-video-radeonhd xorg-xf86-video-nv +#tazpkg install xorg-xf86-video*.tazpkg --root=$ROOTFS --local +#tazpkg -gi openvpn --root=$ROOTFS --local +tazpkg -gi linux64-video --root=$ROOTFS --local +tazpkg -gi linux64-cifs --root=$ROOTFS --local +tazpkg -gi linux64-acpi --root=$ROOTFS --local +tazpkg -gi linux64-configfs --root=$ROOTFS --local +tazpkg -gi linux64-aufs --root=$ROOTFS --local +tazpkg -gi nfs-utils --root=$ROOTFS --local +tazpkg install dockerd.tazpkg --root=$ROOTFS --nodeps --local +tazpkg install teasiu*.tazpkg --root=$ROOTFS --nodeps --local +cp -rf $ROOTFS/etc/xdg/openbox/menu.zh_CN.xml $ROOTFS/etc/xdg/openbox/menu.en.xml +cp -a updatetime.txt $ROOTFS/etc +mkdir -p $ROOTFS/etc/skel/.config/slitaz +echo "root" > $ROOTFS/etc/skel/.config/slitaz/subox.conf +echo "Name[zh_CN]=WiFi无线网络配置" >> $ROOTFS/usr/share/applications/wifi-box.desktop +echo "Name[zh_CN]=设置系统语言" >> $ROOTFS/usr/share/applications/tazbox-locale.desktop +echo "Name[zh_CN]=设置系统时区" >> $ROOTFS/usr/share/applications/tazbox-tz.desktop +echo "Name[zh_CN]=软件包管理器" >> $ROOTFS/usr/share/applications/tazpanel-pkgs.desktop +echo "Name[zh_CN]=设置账号密码" >> $ROOTFS/usr/share/applications/passwd.desktop +echo "Name[zh_CN]=预设应用程序" >> $ROOTFS/usr/share/applications/tazbox-tazapps.desktop +echo "Name[zh_CN]=本地语言包管理" >> $ROOTFS/usr/share/applications/tazbox-manage_i18n.desktop +echo "Name[zh_CN]=国际键盘设置" >> $ROOTFS/usr/share/applications/tazbox-keymap.desktop +rm $ROOTFS/usr/share/locale/zh_TW -rf +rm $ROOTFS/usr/share/locale/ca -rf +rm $ROOTFS/usr/share/locale/da -rf +rm $ROOTFS/usr/share/locale/de -rf +rm $ROOTFS/usr/share/locale/el -rf +rm $ROOTFS/usr/share/locale/es -rf +rm $ROOTFS/usr/share/locale/fa -rf +rm $ROOTFS/usr/share/locale/fr -rf +rm $ROOTFS/usr/share/locale/id -rf +rm $ROOTFS/usr/share/locale/it -rf +rm $ROOTFS/usr/share/locale/ja -rf +rm $ROOTFS/usr/share/locale/pl -rf +rm $ROOTFS/usr/share/locale/pt_BR -rf +rm $ROOTFS/usr/share/locale/ro -rf +rm $ROOTFS/usr/share/locale/ru -rf +rm $ROOTFS/usr/share/locale/sv -rf +cd $ROOTFS/var/lib/tazpkg +rm $ROOTFS/var/lib/tazpkg/packages.* +rm $ROOTFS/var/lib/tazpkg/ID* +rm $ROOTFS/var/lib/tazpkg/files* +rm $ROOTFS/var/lib/tazpkg/*.txt +rm $ROOTFS/var/lib/tazpkg/extra.list +sed -i '4i\export XMODIFIERS="@im=yong"' $ROOTFS/etc/skel/.xinitrc +sed -i '5i\export GTK_IM_MODULE=yong' $ROOTFS/etc/skel/.xinitrc +sed -i '6i\yong &' $ROOTFS/etc/skel/.xinitrc +sed -i 's/Monospace/DejaVu Sans Mono/' $ROOTFS/etc/skel/.Xdefaults +sed -i 's/index.html/index.cn.html/' $ROOTFS/etc/skel/Desktop/slitaz-doc.desktop +sed -i 's/httpd/httpd dropbear nfsd dockerd transmission-daemon/' $ROOTFS/etc/rcS.conf +sed -i 's/UTC/Asia\/\Shanghai/' $ROOTFS/etc/init.d/system.sh +echo '/usr/bin/vlmcsd' >> $ROOTFS/etc/init.d/local.sh +echo "hwclock -s" >> $ROOTFS/etc/init.d/local.sh +echo 'echo "tux:tux" | chpasswd ' >> $ROOTFS/etc/init.d/local.sh +sed -i 's/sh/bash/' $ROOTFS/etc/passwd +sed -i 's/poweroff/sudo \/etc\/init.d\/dockerd stop || poweroff/' /usr/bin/tazbox +sed -i 's/reboot || reboot -f/sudo \/etc\/init.d\/dockerd stop || reboot || reboot -f/' /usr/bin/tazbox +cp -f $ROOTFS/etc/skel/.profile $ROOTFS/etc/skel/.bashrc +cat << EOF | chroot $ROOTFS +tazpkg -b sudo +tazpkg clean-cache +cd /var/lib/tazpkg +rm packages.* +rm ID* +rm files* +rm *.txt +rm extra.list +gtk-query-immodules-2.0 --update-cache +EOF + diff --git a/packages/linux-3.16.55.tazpkg b/packages/linux-3.16.55.tazpkg new file mode 100644 index 0000000..efa97e1 Binary files /dev/null and b/packages/linux-3.16.55.tazpkg differ diff --git a/packages/linux64-3.16.55.tazpkg b/packages/linux64-3.16.55.tazpkg index 5299c83..c587bd3 100644 Binary files a/packages/linux64-3.16.55.tazpkg and b/packages/linux64-3.16.55.tazpkg differ