...
 
Commits (7)
......@@ -144,7 +144,7 @@ $(foreach p,$(wildcard $1/*),echo "Applying \"$1\" to \"$2\":" && \
endef
CASPER_SOURCE_DIR=$(ISO_CONTENT)/casper
INITRD_SOURCE=$(CASPER_SOURCE_DIR)/initrd.lz
INITRD_SOURCE=$(CASPER_SOURCE_DIR)/initrd
SQUASHFS_SOURCE=$(CASPER_SOURCE_DIR)/filesystem.squashfs
APT_CACHE_DIR=$(WORKSPACE)/apt_cache
......@@ -340,7 +340,7 @@ rootfs_common_clean:
initrd_unpack : $(ARCH_DIR)$(STATE_DIR)/initrd_extracted
$(call gentargets,$(STATE_DIR)/initrd_extracted) : $(call archdir,%)$(STATE_DIR)/iso_extracted
mkdir -p "$(call archdir,$*)$(INITRD)"
cd "$(call archdir,$*)$(INITRD)" && lzma $(XZ_LZMA_FLAGS) -d < "$(call archdir,$*)$(INITRD_SOURCE)" | cpio -i
cd "$(call archdir,$*)$(INITRD)" && (cpio -t; lzma $(XZ_LZMA_FLAGS) -d) < "$(call archdir,$*)$(INITRD_SOURCE)" | cpio -i
touch "$(call archdir,$*)$(STATE_DIR)/initrd_extracted"
initrd_clean:
......@@ -601,6 +601,7 @@ $(REPO_DIST_DIR)/binary-$(call altarch,$(PRIMARY_ARCH))/Packages $(REPO_DIST_DIR
>> "$(REPO_DIST_DIR)/binary-$*/Release"
cd "$(REPO_ARCHIVE_DIR)" \
&& touch "Packages.$*" \
&& cat Packages.noarch "Packages.$*" > "$(REPO_DIST_DIR)/binary-$*/Packages"
#The following rules requires none of its dependencies. However, it writes a timestamp to the metadata
......
time /bin/sh -c 'sudo make clean_really_all && sudo rm -rf /workspace/* && make WORKSPACE=/workspace config && sudo make image && sudo make repo && sudo make IMAGE_FILE=/home/buildhauer/images/lip-ws17-beta1-4.img image_deploy' 2>&1 | tee ~/build-4.log
#see /home/buildhauer/lipck/config/Makefile.conf.defaults for default values.
WORKSPACE=/workspace
PRIMARY_ARCH=x86_64
SECONDARY_ARCH=i686
ISO_BASE_URL=http://cdimage.ubuntu.com/kubuntu/releases
ISO_RELEASE=artful
ISO_CHANNEL=release
ISO_VERSION=17.10.1
ISO_FLAVOR=kubuntu
ISO_PATTERN_FLAGS=
APT_SOURCE_URL_OVERRIDE=http://ftp.halifax.rwth-aachen.de/ubuntu/
IMAGE_GIT_URL=https://git.fsmpi.rwth-aachen.de/osak/lipstick.git
IMAGE_GIT_BRANCH=ss18
IMAGE_EXTRA_INFO=
IMAGE_PART_SIZE=7600MB
IMAGE_PART_LABEL=LIPStick
IMAGE_GRUB_COMMON_MODULES=part_msdos fat ext2
IMAGE_GRUB_MBR_MODULES=part_msdos fat ext2 biosdisk
IMAGE_GRUB_EFI_MODULES=part_msdos fat ext2 normal part_gpt terminal crypto search_fs_file search_fs_uuid search_label extcmd minicmd lvm gfxterm loopback efifwsetup efi_gop efinet efi_uga exfat ntfs cmp test configfile search echo font gettext boot tar memdisk ls cpuid
GPARTED_VERSION=0.28.1-1
#see /home/buildhauer/lipck/config/Makefile.conf.defaults for default values.
WORKSPACE=/workspace
PRIMARY_ARCH=x86_64
SECONDARY_ARCH=i686
ISO_BASE_URL=http://cdimage.ubuntu.com/kubuntu/
ISO_RELEASE=artful
ISO_CHANNEL=daily-live/current
ISO_VERSION=17.10
ISO_FLAVOR=kubuntu
ISO_PATTERN_FLAGS=release-prefix url-no-release
APT_SOURCE_URL_OVERRIDE=http://ftp.halifax.rwth-aachen.de/ubuntu/
IMAGE_GIT_URL=https://git.fsmpi.rwth-aachen.de/osak/lipstick.git
IMAGE_GIT_BRANCH=ws17
IMAGE_EXTRA_INFO=
IMAGE_PART_SIZE=7600MB
IMAGE_PART_LABEL=LIPStick
IMAGE_GRUB_COMMON_MODULES=part_msdos fat ext2
IMAGE_GRUB_MBR_MODULES=part_msdos fat ext2 biosdisk
IMAGE_GRUB_EFI_MODULES=part_msdos fat ext2 normal part_gpt terminal crypto search_fs_file search_fs_uuid search_label extcmd minicmd lvm gfxterm loopback efifwsetup efi_gop efinet efi_uga exfat ntfs cmp test configfile search echo font gettext boot tar memdisk ls cpuid
GPARTED_VERSION=0.28.1-1
PRIMARY_ARCH=x86_64
SECONDARY_ARCH=i686
ISO_BASE_URL=http://cdimage.ubuntu.com/kubuntu/releases
ISO_RELEASE=artful
ISO_CHANNEL=beta-1
ISO_VERSION=17.10-beta1
ISO_FLAVOR=kubuntu
ISO_PATTERN_FLAGS=
APT_SOURCE_URL_OVERRIDE=http://ftp.halifax.rwth-aachen.de/ubuntu/
IMAGE_GIT_URL=https://git.fsmpi.rwth-aachen.de/osak/lipstick.git
IMAGE_GIT_BRANCH=ss17
IMAGE_EXTRA_INFO=
IMAGE_PART_SIZE=7600MB
IMAGE_PART_LABEL=LIPStick
IMAGE_GRUB_COMMON_MODULES=part_msdos fat ext2
IMAGE_GRUB_MBR_MODULES=part_msdos fat ext2 biosdisk
IMAGE_GRUB_EFI_MODULES=part_msdos fat ext2 normal part_gpt terminal crypto search_fs_file search_fs_uuid search_label extcmd minicmd lvm gfxterm loopback efifwsetup efi_gop efinet efi_uga exfat ntfs cmp test configfile search echo font gettext boot tar memdisk ls cpuid
GPARTED_VERSION=0.28.1-1
......@@ -31,12 +31,6 @@
"pkgdescription": "Tool zum visualisieren von Graphen",
"tagged": true
},
{
"pkgname": "xubuntu-desktop",
"pkgdescription": "Xubuntu Desktop Umgebung und standard Programme",
"tagged": false,
"hidden": true
},
{
"pkgname": "fityk",
"pkgdescription": "Tool zum Daten-Fitting und Analyse",
......@@ -83,22 +77,22 @@
"tagged": true
},
{
"pkgname": "linux-image-4.14.0-041400rc3-generic",
"pkgname": "linux-image-unsigned-4.18.8-041808-generic",
"pkgdescription": "Vanilla Linux Kernel",
"tagged": false,
"urls": [
"http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.14-rc3/linux-image-4.14.0-041400rc3-generic_4.14.0-041400rc3.201710011930_amd64.deb",
"http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.14-rc3/linux-image-4.14.0-041400rc3-generic_4.14.0-041400rc3.201710011930_i386.deb"
"http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.18.8/linux-image-unsigned-4.18.8-041808-generic_4.18.8-041808.201809150431_amd64.deb",
"http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.18.8/linux-image-4.18.8-041808-generic_4.18.8-041808.201809150431_i386.deb"
]
},
{
"pkgname": "linux-headers-4.14.0-041400rc3-generic",
"pkgname": "linux-headers-4.18.8-041808-generic",
"pkgdescription": "Vanilla Linux Kernel Headers",
"tagged": false,
"urls": [
"http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.14-rc3/linux-headers-4.14.0-041400rc3_4.14.0-041400rc3.201710011930_all.deb",
"http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.14-rc3/linux-headers-4.14.0-041400rc3-generic_4.14.0-041400rc3.201710011930_amd64.deb",
"http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.14-rc3/linux-headers-4.14.0-041400rc3-generic_4.14.0-041400rc3.201710011930_i386.deb"
"http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.18.8/linux-headers-4.18.8-041808_4.18.8-041808.201809150431_all.deb",
"http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.18.8/linux-headers-4.18.8-041808-generic_4.18.8-041808.201809150431_amd64.deb",
"http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.18.8/linux-headers-4.18.8-041808-generic_4.18.8-041808.201809150431_i386.deb"
]
}
]
......@@ -109,47 +103,7 @@
"pkgname": "singular",
"pkgdescription": "Tool für die Vorlesung Computeralgebra",
"tagged": true,
"hidden": true,
"urls": [
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular_4.0.3-p3+ds-5_amd64.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular_4.0.3-p3+ds-5_i386.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-ui_4.0.3-p3+ds-5_amd64.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-ui_4.0.3-p3+ds-5_i386.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-data_4.0.3-p3+ds-5_all.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-modules_4.0.3-p3+ds-5_amd64.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-modules_4.0.3-p3+ds-5_i386.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/singular-doc_4.0.3-p3+ds-5_all.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/libsingular4_4.0.3-p3+ds-5_amd64.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/s/singular/libsingular4_4.0.3-p3+ds-5_i386.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/f/flint/libflint-2.5.2_2.5.2-15_amd64.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/f/flint/libflint-2.5.2_2.5.2-15_i386.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/n/ntl/libntl27_9.9.1-3_amd64.deb",
"ftp://ftp.halifax.rwth-aachen.de/debian/pool/main/n/ntl/libntl27_9.9.1-3_i386.deb"
]
},
{
"pkgname": "libcdd0d",
"pkgdescription": "Abhängigkeit von Singular",
"tagged" : false,
"hidden" : true
},
{
"pkgname": "normaliz",
"pkgdescription": "Abhängigkeit von Singular",
"tagged" : false,
"hidden" : true
},
{
"pkgname": "surf-alggeo",
"pkgdescription": "Abhängigkeit von Singular",
"tagged" : false,
"hidden" : true
},
{
"pkgname": "python-polybori",
"pkgdescription": "Abhängigkeit von Singular",
"tagged" : false,
"hidden" : true
"hidden": true
},
{
"pkgname": "codeblocks",
......@@ -256,11 +210,6 @@
},
"Informatik": {
"packages": [
{
"pkgname": "eclipse",
"pkgdescription": "Umfangreiche Entwicklungsumgebung für verschiedene Programiersprachen, vornehmlich Java.",
"tagged": false
},
{
"pkgname": "postgresql",
"pkgdescription": "Datenbank-Server. Nett um in der Datenbanken-Vorlesungen Dinge auszuprobieren",
......
......@@ -5,7 +5,7 @@ kompare
xloadimage
gpsd-clients
kde-config-gtk-style
libav-tools
ffmpeg
hunspell
vlc
p7zip-full
......@@ -13,6 +13,9 @@ unrar-free
kile
okular
#Zenity for Linuxparty.sh
zenity
#System stuff, e.g. gcc and efibootmgr
automake
cmake
......@@ -29,6 +32,8 @@ vim
htop
git
gparted
grub-efi-amd64-signed
shim-signed
#texlive
dvidvi
......
#!/bin/zsh
egrep -v "rescue|bad-sector|liberror" build-6.log | egrep -i "^E:|error|warn|fail" -A1
......@@ -2,7 +2,7 @@
BEGIN {
# This is the number of things we're going to remove. Adjust it when changing the regular expression below
want = 7;
want = 2;
skipped = 0;
}
......@@ -16,14 +16,17 @@ function skipit() {
/^linux-signed-image-.*-generic/ {
skipit()
#not in manifest since ws18
}
/^zenity/ {
skipit()
#not in manifest since before ss18
}
/^(lib(javascriptcoregtk|webkit2gtk))/ {
skipit()
#not in manifest since before ss18
}
/^(python3-pyqt5.(qtsvg|qtwebkit))/ {
......
......@@ -38,7 +38,7 @@ function divert_initctl()
{
dpkg-divert --local --rename --add /sbin/initctl
if ! ln -s /bin/true /sbin/initctl; then
echo "LIPCK: Failed to divert initctl!"
echo "LIPCK: Failed to divert initctl (probably some error occured since diversion was added)!"
revert_initctl
exit 1
fi
......
......@@ -24,6 +24,7 @@ ARCH="$1"
DESTINATION="${2:-"/cdrom"}"
SCRIPT_DIR="/remaster"
CONTRIB_DIR="$SCRIPT_DIR/contrib/"
export DEBIAN_FRONTEND=noninteractive
test -n "$ARCH" || { echo "$(basename $0): fatal error: no architecture specified."; exit 1; }
......
......@@ -22,6 +22,7 @@ set -e
SCRIPT_DIR="/remaster"
CONTRIB_DIR="$SCRIPT_DIR/contrib/"
export DEBIAN_FRONTEND=noninteractive
#source common functions
if [ -e "$SCRIPT_DIR/scripts/common_functions.sh" ]; then
......
......@@ -19,6 +19,8 @@
# along with UCK. If not, see <http://www.gnu.org/licenses/>. #
###################################################################################
export DEBIAN_FRONTEND=noninteractive
function install_lang_packages()
{
#the content of this function is extracted from UCK
......