diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rwxr-xr-x | doc/handbook/get_wiki_handbook | 2 | ||||
| -rwxr-xr-x | doc/handbook/get_wiki_release_notes | 2 | ||||
| -rw-r--r-- | iso/setup.dependencies | 30 | ||||
| -rwxr-xr-x | mkhybrid | 3 | ||||
| -rw-r--r-- | packages.opt | 8 |
6 files changed, 29 insertions, 25 deletions
@@ -7,7 +7,7 @@ CRUXVERSION = 3.2 CUSTOMVERSION = COLLECTIONS = core opt xorg KERNEL_MIRROR = http://www.kernel.org -KERNEL_VERSION = 4.0.6 +KERNEL_VERSION = 4.1.8 KERNEL_PATCHES = BB_VERSION = 1.22.1 MEMTEST_VERSION = 5.01 @@ -178,8 +178,10 @@ distclean: clean kernel-distclean setup.dependencies-clean $(COLLECTIONS): check-root @for p in $(PORTS_$(@)); do \ - echo "port: $$p"; \ - (cd $(PORTS_DIR)/$@/$$p && pkgmk -cf $(PKGMK_CONF) $(PKGMK_DOWNLOAD) $(PKGMK_FORCE)); \ + if [ "$$p" != "COPYING" -a "$$p" != "COPYRIGHT" ]; then \ + echo "port: $$p"; \ + (cd $(PORTS_DIR)/$@/$$p && pkgmk -cf $(PKGMK_CONF) $(PKGMK_DOWNLOAD) $(PKGMK_FORCE)); \ + fi; \ done all: $(COLLECTIONS) @@ -414,6 +416,7 @@ iso: image-base memtest -boot-info-table \ -eltorito-alt-boot -e boot/efiboot.img -no-emul-boot \ -sort /tmp/iso.sort -o "$(ISO_FILENAME)" $(IMG_ROOT_DIR) + @isohybrid -u $(ISO_FILENAME) @md5sum `basename $(ISO_FILENAME)` > `basename $(ISO_FILENAME) .iso`.md5 @rm /tmp/iso.sort @echo "Done: $(shell date)" diff --git a/doc/handbook/get_wiki_handbook b/doc/handbook/get_wiki_handbook index ba6710b..ef36e15 100755 --- a/doc/handbook/get_wiki_handbook +++ b/doc/handbook/get_wiki_handbook @@ -4,7 +4,7 @@ INFILE=handbook.in OUTFILE=handbook.txt -CRUX_VERSION=3.1 +CRUX_VERSION=3.2 TITLE="HANDBOOK FOR CRUX $CRUX_VERSION" URL="http://crux.nu/Main/Handbook${CRUX_VERSION/\./-}?action=print" diff --git a/doc/handbook/get_wiki_release_notes b/doc/handbook/get_wiki_release_notes index 0e01c8f..9d5d512 100755 --- a/doc/handbook/get_wiki_release_notes +++ b/doc/handbook/get_wiki_release_notes @@ -4,7 +4,7 @@ INFILE=releasenotes.in OUTFILE=releasenotes.txt -CRUX_VERSION=3.1 +CRUX_VERSION=3.2 URL="http://crux.nu/Main/ReleaseNotes${CRUX_VERSION//\./-}?action=print" set -x diff --git a/iso/setup.dependencies b/iso/setup.dependencies index 6126d2c..419a553 100644 --- a/iso/setup.dependencies +++ b/iso/setup.dependencies @@ -8,7 +8,6 @@ bin86: bin86 bindutils: openssl bindutils binutils: zlib flex binutils bison: bison -btrfs-progs: kmod ncurses zlib lzo eudev util-linux e2fsprogs btrfs-progs bzip2: bzip2 ca-certificates: ca-certificates coreutils: libgmp attr acl libcap coreutils @@ -22,7 +21,7 @@ diffutils: diffutils e2fsprogs: kmod ncurses zlib eudev util-linux e2fsprogs ed: ed eudev: kmod eudev -exim: db openssl libpcre tcp_wrappers exim +exim: db openssl libpcre exim file: zlib file filesystem: filesystem findutils: findutils @@ -44,13 +43,12 @@ inetutils: ncurses readline inetutils iproute2: db iptables iproute2 iptables: iptables iputils: attr openssl sysfsutils libcap iputils -jfsutils: kmod ncurses zlib eudev util-linux jfsutils kbd: kbd kmod: kmod less: ncurses libpcre less libarchive: bzip2 xz zlib attr acl libarchive libcap: attr libcap -libdevmapper: kmod eudev libdevmapper +libdevmapper: kmod ncurses zlib eudev util-linux libdevmapper libgmp: libgmp libmpc: libgmp libmpfr libmpc libmpfr: libgmp libmpfr @@ -59,7 +57,7 @@ libpipeline: libpipeline libtool: libtool libusb: kmod eudev libusb libusb-compat: kmod eudev libusb libusb-compat -lilo: kmod ncurses zlib eudev libdevmapper util-linux lilo +lilo: kmod ncurses zlib eudev util-linux libdevmapper lilo lzo: lzo m4: m4 make: make @@ -77,13 +75,11 @@ perl: db gdbm perl pkg-config: pkg-config pkgutils: bzip2 xz zlib attr acl libarchive pkgutils ports: ports -ppp: zlib openssl ppp procps: ncurses procps prt-get: prt-get psmisc: ncurses psmisc rc: rc readline: ncurses readline -reiserfsprogs: kmod ncurses zlib eudev util-linux reiserfsprogs rsync: attr acl rsync sed: attr acl sed shadow: attr acl shadow @@ -93,21 +89,18 @@ sysfsutils: sysfsutils sysklogd: sysklogd sysvinit: sysvinit tar: tar -tcp_wrappers: tcp_wrappers time: time tzdata: tzdata -unzip: unzip usbutils: kmod eudev libusb usbutils util-linux: kmod ncurses zlib eudev util-linux vim: ncurses attr acl vim wget: openssl wget which: which -xfsprogs: kmod ncurses zlib eudev util-linux xfsprogs xz: xz -zip: bzip2 zip zlib: zlib alsa-lib: alsa-lib atk: libpcre libffi db gdbm openssl bzip2 zlib ncurses readline sqlite3 python glib gobject-introspection atk +btrfs-progs: kmod ncurses zlib lzo eudev util-linux e2fsprogs btrfs-progs cairo: zlib expat db gdbm openssl bzip2 ncurses xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-util-macros xorg-renderproto xorg-libpixman libpcre libffi libpng libxml2 readline xorg-libxdmcp xorg-libxau xorg-xtrans xorg-kbproto xorg-inputproto freetype libxslt sqlite3 fontconfig python xorg-xcb-proto glib xorg-libxcb xorg-libx11 xorg-xcb-util xorg-libxext xorg-libxrender cairo cdrkit: zlib openssl bzip2 xz attr expat ncurses file curl acl libcap libarchive cmake cdrkit cmake: openssl zlib bzip2 xz attr expat ncurses curl acl libarchive cmake @@ -120,20 +113,21 @@ elilo: gnu-efi elilo expat: expat fakeroot: fakeroot fetchmail: openssl fetchmail -firefox: nspr ncurses libpcre libffi db gdbm openssl bzip2 zlib hicolor-icon-theme libjpeg-turbo xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-util-macros expat xorg-renderproto xorg-libpixman xorg-fixesproto xorg-xineramaproto xorg-randrproto xorg-compositeproto alsa-lib yasm xz xorg-libpciaccess xorg-dri2proto xorg-dri3proto xorg-damageproto xorg-videoproto xorg-presentproto kmod readline libpng libxml2 libtiff xorg-libxdmcp xorg-libxau xorg-xtrans xorg-kbproto xorg-inputproto xorg-glproto xorg-libxshmfence elfutils libdrm eudev sqlite3 freetype libxslt xorg-libice util-linux nss python fontconfig xorg-libsm glib xorg-xcb-proto llvm libidl gobject-introspection xorg-libxcb atk gstreamer xorg-libx11 xorg-xcb-util gdk-pixbuf xorg-libxext xorg-libxrender xorg-libxfixes xorg-libxt xorg-libxinerama libvdpau xorg-libxv cairo xorg-libxft xorg-libxrandr xorg-libxcursor xorg-libxcomposite xorg-libxdamage xorg-libxvmc harfbuzz mesa3d pango gtk gst-plugins-base firefox +firefox: nspr ncurses unzip bzip2 libpcre libffi db gdbm openssl zlib hicolor-icon-theme libjpeg-turbo xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-util-macros expat xorg-renderproto xorg-libpixman xorg-fixesproto xorg-xineramaproto xorg-randrproto xorg-compositeproto alsa-lib yasm xz xorg-libpciaccess xorg-dri2proto xorg-dri3proto xorg-damageproto xorg-videoproto xorg-presentproto kmod readline zip libpng libxml2 libtiff xorg-libxdmcp xorg-libxau xorg-xtrans xorg-kbproto xorg-inputproto xorg-glproto xorg-libxshmfence elfutils libdrm eudev sqlite3 freetype libxslt xorg-libice util-linux nss python fontconfig xorg-libsm glib xorg-xcb-proto llvm libidl gobject-introspection xorg-libxcb atk gstreamer xorg-libx11 xorg-xcb-util gdk-pixbuf xorg-libxext xorg-libxrender xorg-libxfixes xorg-libxt xorg-libxinerama libvdpau xorg-libxv cairo xorg-libxft xorg-libxrandr xorg-libxcursor xorg-libxcomposite xorg-libxdamage xorg-libxvmc harfbuzz mesa3d pango gtk gst-plugins-base firefox fontconfig: zlib expat libpng freetype fontconfig freetype: zlib libpng freetype gdk-pixbuf: db gdbm openssl bzip2 zlib ncurses libpcre libffi libjpeg-turbo xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-util-macros libpng libxml2 readline libtiff xorg-libxdmcp xorg-libxau xorg-xtrans xorg-kbproto xorg-inputproto libxslt sqlite3 python glib xorg-xcb-proto gobject-introspection xorg-libxcb xorg-libx11 gdk-pixbuf glib: libpcre libffi db gdbm openssl bzip2 zlib ncurses readline sqlite3 python glib gnu-efi: gnu-efi gobject-introspection: db gdbm openssl bzip2 zlib ncurses libpcre libffi readline sqlite3 python glib gobject-introspection -grub2: kmod zlib eudev libpng libdevmapper freetype grub2 +grub2: kmod ncurses zlib eudev libpng util-linux freetype libdevmapper grub2 gstreamer: db gdbm openssl bzip2 zlib ncurses libpcre libffi libxml2 readline sqlite3 python glib gobject-introspection gstreamer gst-plugins-base: alsa-lib db gdbm openssl bzip2 zlib ncurses libpcre libffi expat xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-util-macros xorg-renderproto xorg-libpixman kmod xorg-videoproto libxml2 libpng readline xorg-libxdmcp xorg-libxau xorg-xtrans xorg-kbproto xorg-inputproto eudev libxslt freetype sqlite3 xorg-libice util-linux fontconfig python xorg-libsm glib xorg-xcb-proto gobject-introspection xorg-libxcb gstreamer xorg-libx11 xorg-xcb-util xorg-libxext xorg-libxrender xorg-libxv cairo xorg-libxft harfbuzz pango gst-plugins-base gtk: libpcre libffi db gdbm openssl bzip2 zlib ncurses hicolor-icon-theme libjpeg-turbo xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-util-macros expat xorg-renderproto xorg-libpixman xorg-fixesproto xorg-xineramaproto xorg-randrproto xorg-compositeproto libpng libxml2 readline libtiff xorg-libxdmcp xorg-libxau xorg-xtrans xorg-kbproto xorg-inputproto freetype libxslt sqlite3 xorg-libice fontconfig python xorg-libsm glib xorg-xcb-proto gobject-introspection xorg-libxcb atk xorg-libx11 xorg-xcb-util gdk-pixbuf xorg-libxext xorg-libxrender xorg-libxfixes xorg-libxinerama cairo xorg-libxft xorg-libxrandr xorg-libxcursor xorg-libxcomposite harfbuzz pango gtk harfbuzz: zlib expat db gdbm openssl bzip2 ncurses xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-util-macros xorg-renderproto xorg-libpixman libpcre libffi libpng libxml2 readline xorg-libxdmcp xorg-libxau xorg-xtrans xorg-kbproto xorg-inputproto freetype libxslt sqlite3 fontconfig python xorg-xcb-proto glib xorg-libxcb xorg-libx11 xorg-xcb-util xorg-libxext xorg-libxrender cairo harfbuzz hicolor-icon-theme: hicolor-icon-theme intltool: expat db gdbm perl p5-xml-parser intltool +jfsutils: kmod ncurses zlib eudev util-linux jfsutils keyutils: keyutils libevent: libevent libffi: libffi @@ -148,7 +142,7 @@ libxml2: zlib libxml2 libxml2-python: db gdbm openssl bzip2 zlib ncurses libxml2 readline sqlite3 python libxml2-python libxslt: zlib libxml2 libxslt llvm: db gdbm openssl bzip2 zlib ncurses readline sqlite3 python llvm -lvm2: kmod eudev libdevmapper lvm2 +lvm2: kmod ncurses zlib eudev util-linux libdevmapper lvm2 mdadm: mdadm mtools: mtools mutt: gdbm ncurses openssl zlib mutt @@ -159,20 +153,24 @@ nss: nspr ncurses readline sqlite3 nss openbox: db gdbm openssl bzip2 zlib ncurses xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-util-macros xorg-xineramaproto xorg-renderproto xorg-randrproto libpcre libffi expat xorg-libpixman libxml2 libpng readline xorg-libxdmcp xorg-libxau xorg-xtrans xorg-kbproto xorg-inputproto libxslt freetype sqlite3 xorg-libice fontconfig python xorg-libsm xorg-xcb-proto glib xorg-libxcb gobject-introspection xorg-libx11 xorg-xcb-util xorg-libxext xorg-libxrender xorg-libxinerama xorg-libxrandr cairo xorg-libxft harfbuzz pango openbox p5-xml-parser: expat db gdbm perl p5-xml-parser pango: zlib expat db gdbm openssl bzip2 ncurses xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-util-macros xorg-renderproto xorg-libpixman libpcre libffi libpng libxml2 readline xorg-libxdmcp xorg-libxau xorg-xtrans xorg-kbproto xorg-inputproto freetype libxslt sqlite3 xorg-libice fontconfig python xorg-libsm xorg-xcb-proto glib xorg-libxcb gobject-introspection xorg-libx11 xorg-xcb-util xorg-libxext xorg-libxrender cairo xorg-libxft harfbuzz pango -parted: kmod ncurses zlib eudev readline libdevmapper util-linux parted +parted: kmod ncurses zlib eudev readline util-linux libdevmapper parted popt: ncurses attr acl gettext popt +ppp: zlib openssl ppp procmail: procmail python: db gdbm openssl bzip2 zlib ncurses readline sqlite3 python +reiserfsprogs: kmod ncurses zlib eudev util-linux reiserfsprogs rpcbind: libtirpc rpcbind -rp-pppoe: zlib openssl ppp rp-pppoe sqlite3: ncurses readline sqlite3 syslinux: mtools db gdbm openssl bzip2 zlib ncurses perl readline sqlite3 python syslinux talloc: db gdbm openssl bzip2 zlib ncurses readline sqlite3 python talloc +unzip: unzip wireless-tools: wireless-tools wpa_supplicant: openssl ncurses libnl readline wpa_supplicant wvdial: zlib openssl ppp wvdial +xfsprogs: kmod ncurses zlib eudev util-linux xfsprogs xterm: xorg-xproto db gdbm openssl bzip2 zlib ncurses libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-util-macros xorg-font-alias xorg-font-util xorg-fontsproto xorg-mkfontdir xorg-libxdmcp xorg-libxau xorg-libfontenc libxml2 libpng readline xorg-xtrans xorg-kbproto xorg-inputproto libxslt freetype sqlite3 xorg-libice xorg-libxfont python xorg-libsm xorg-bdftopcf xorg-xcb-proto xorg-libxcb xorg-libx11 xorg-libxext xorg-libxt xorg-mkfontscale xorg-libxmu xorg-libxpm xorg-font-misc-misc xorg-libxaw xterm yasm: yasm +zip: bzip2 zip glu: bzip2 xz zlib expat libpthread-stubs xorg-libpciaccess db gdbm openssl ncurses xorg-xproto xorg-xf86bigfontproto xorg-xextproto xorg-util-macros xorg-dri2proto xorg-dri3proto xorg-damageproto xorg-fixesproto xorg-videoproto xorg-presentproto elfutils libxml2 libdrm readline xorg-libxdmcp xorg-libxau xorg-xtrans xorg-kbproto xorg-inputproto xorg-glproto xorg-libxshmfence libxslt sqlite3 python xorg-xcb-proto llvm xorg-libxcb xorg-libx11 xorg-libxext xorg-libxfixes libvdpau xorg-libxv xorg-libxdamage xorg-libxvmc mesa3d glu libdrm: libpthread-stubs xorg-libpciaccess libdrm libepoxy: bzip2 xz zlib expat libpthread-stubs xorg-libpciaccess db gdbm openssl ncurses xorg-xproto xorg-xf86bigfontproto xorg-xextproto xorg-util-macros xorg-dri2proto xorg-dri3proto xorg-damageproto xorg-fixesproto xorg-videoproto xorg-presentproto elfutils libxml2 libdrm readline xorg-libxdmcp xorg-libxau xorg-xtrans xorg-kbproto xorg-inputproto xorg-glproto xorg-libxshmfence libxslt sqlite3 python xorg-xcb-proto llvm xorg-libxcb xorg-libx11 xorg-libxext xorg-libxfixes libvdpau xorg-libxv xorg-libxdamage xorg-libxvmc mesa3d libepoxy diff --git a/mkhybrid b/mkhybrid deleted file mode 100755 index aab65bb..0000000 --- a/mkhybrid +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -for x in *.iso; do echo $x; isohybrid -u $x; md5sum $x > $(basename $x .iso).md5; done diff --git a/packages.opt b/packages.opt index c60b372..c58a6bf 100644 --- a/packages.opt +++ b/packages.opt @@ -1,5 +1,6 @@ alsa-lib atk +btrfs-progs cairo cdrkit cmake @@ -26,6 +27,7 @@ gtk harfbuzz hicolor-icon-theme intltool +jfsutils keyutils libevent libffi @@ -53,15 +55,19 @@ p5-xml-parser pango parted popt +ppp procmail python +reiserfsprogs rpcbind -rp-pppoe sqlite3 syslinux talloc +unzip wireless-tools wpa_supplicant wvdial +xfsprogs xterm yasm +zip |