From e87a451902448c4d62ec803a2659e024e85db87e Mon Sep 17 00:00:00 2001 From: Mike Staszel Date: Mon, 1 Aug 2011 17:18:04 -0500 Subject: [PATCH] Cleanup part 1 --- aur/iscsitarget/PKGBUILD | 2 +- core/mkinitcpio-busybox/PKGBUILD | 2 +- core/pacman/PKGBUILD | 4 +- core/plugapps-scripts/PKGBUILD | 18 ------ core/plugapps-scripts/README | 3 - .../plugapps-scripts/plugapps-scripts.install | 19 ------- core/ppl/PKGBUILD | 3 +- .../tcp_wrappers-7.6-13-arm.pkg.tar.xz | 1 - core/xfsprogs/PKGBUILD | 2 +- scripts/aur-syncer | 3 +- scripts/distro-builder | 31 ++-------- scripts/recursive-builder | 56 ------------------- 12 files changed, 11 insertions(+), 133 deletions(-) delete mode 100755 core/plugapps-scripts/PKGBUILD delete mode 100644 core/plugapps-scripts/README delete mode 100644 core/plugapps-scripts/plugapps-scripts.install delete mode 120000 core/tcp_wrappers/tcp_wrappers-7.6-13-arm.pkg.tar.xz delete mode 100755 scripts/recursive-builder diff --git a/aur/iscsitarget/PKGBUILD b/aur/iscsitarget/PKGBUILD index b4a5ea1ca..2830d2285 100644 --- a/aur/iscsitarget/PKGBUILD +++ b/aur/iscsitarget/PKGBUILD @@ -1,4 +1,4 @@ -# PlugApps: Kevin Mihelich +# ALARM: Kevin Mihelich # - Derived from the AUR PKGBUILDs, which split between kernel and # userspace, which just doesn't make sense at all. # - We make an SVN package since current releases don't support 2.6.37. diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index 31e7780ff..d818dd9a4 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 123921 2011-05-14 11:29:02Z thomas $ # Maintainer: Thomas Bächler -# PlugApps: Kevin Mihelich +# ALARM: Kevin Mihelich # - removed -mtune, changed -march to v7/v5 compat plugrel=1 diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index 0995659b7..7ac4437bf 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -1,10 +1,10 @@ # $Id: PKGBUILD 126847 2011-06-07 19:50:19Z dan $ # Maintainer: Dan McGee -# PlugApps: Kevin Mihelich +# ALARM: Kevin Mihelich # - arch/host/flags for arm and armv7 # - depend on current versions of libarchive, libfetch, xz to fix upgrade issues -# - pacman.conf: architecture=arm, added our aur repo +# - pacman.conf: architecture=arm/armv7h, added our aur repo # - makepkg.conf: add --no-check-certificate to http wget, adjusted C/CXX/LDFLAGS plugrel=1 diff --git a/core/plugapps-scripts/PKGBUILD b/core/plugapps-scripts/PKGBUILD deleted file mode 100755 index ddf1f70e6..000000000 --- a/core/plugapps-scripts/PKGBUILD +++ /dev/null @@ -1,18 +0,0 @@ -# Maintainer: Mike Staszel - -pkgname=plugapps-scripts -pkgver=2011.01 -pkgrel=1 -plugrel=2 -pkgdesc="Useful scripts and general fixes from PlugApps" -arch=('arm') -url="http://plugapps.com" -license=('GPL') -source=(README) -install="plugapps-scripts.install" -md5sums=('5cb87e1e776c81d4af134a884a1cdd48') - -build() { - mkdir -p $pkgdir/usr/share/plugapps - install -m755 $srcdir/README $pkgdir/usr/share/plugapps/ -} diff --git a/core/plugapps-scripts/README b/core/plugapps-scripts/README deleted file mode 100644 index d6b12ee5e..000000000 --- a/core/plugapps-scripts/README +++ /dev/null @@ -1,3 +0,0 @@ -The plugapps-scripts package contains fixes and scripts -that users can optionally run, as well as fixes we sometimes -discover after updating packages. diff --git a/core/plugapps-scripts/plugapps-scripts.install b/core/plugapps-scripts/plugapps-scripts.install deleted file mode 100644 index 21de04e1d..000000000 --- a/core/plugapps-scripts/plugapps-scripts.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { -echo -e "\033[1mNotice\033[0m" -echo "Upgrading your installation..." -# some commands here -# more commands -} - -post_upgrade() { - post_install -} - -post_remove() { - #functions break if there isn't something in them - echo "nothing here" > /dev/null -} - -op=$1 -shift -$op $* diff --git a/core/ppl/PKGBUILD b/core/ppl/PKGBUILD index d58567733..0f7f65511 100644 --- a/core/ppl/PKGBUILD +++ b/core/ppl/PKGBUILD @@ -1,7 +1,6 @@ -# $Id: PKGBUILD 111674 2011-02-28 10:47:00Z allan $ # Maintainer: Allan McRae # Contributor: ezzetabi -# PlugApps: Kevin Mihelich +# ALARM: Kevin Mihelich noautobuild=1 # prevent plugbuild from autobuilding this package plugrel=1 diff --git a/core/tcp_wrappers/tcp_wrappers-7.6-13-arm.pkg.tar.xz b/core/tcp_wrappers/tcp_wrappers-7.6-13-arm.pkg.tar.xz deleted file mode 120000 index 2fe9f02f5..000000000 --- a/core/tcp_wrappers/tcp_wrappers-7.6-13-arm.pkg.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/build/packages/extra/tcp_wrappers-7.6-13-arm.pkg.tar.xz \ No newline at end of file diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD index c3404763a..82d6bd5e1 100644 --- a/core/xfsprogs/PKGBUILD +++ b/core/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 118982 2011-04-09 21:14:21Z tpowa $ # Maintainer: Paul Mattal -# PlugApps: Kevin Mihelich +# ALARM: Kevin Mihelich # - original OPTIMIZER export does not play nice with our system plugrel=1 diff --git a/scripts/aur-syncer b/scripts/aur-syncer index 530906384..b6708da9b 100755 --- a/scripts/aur-syncer +++ b/scripts/aur-syncer @@ -6,13 +6,12 @@ # # This is to keep our [aur] repo up-to-date. # -GITDIR=/build/plugapps +GITDIR=/build/alarm AURTARBALLURL=http://aur.archlinux.org/packages/ # Only the following packages will be deleted and re-downloaded PKGLIST=yaourt open-iscsi -# Main loop cd $GITDIR/aur rm -rf $PKGLIST diff --git a/scripts/distro-builder b/scripts/distro-builder index f8dd796b3..1a33dacda 100755 --- a/scripts/distro-builder +++ b/scripts/distro-builder @@ -1,10 +1,10 @@ #!/bin/bash # -# PlugApps Linux Distribution Image Builder +# Arch Linux ARM Image Builder # # Licensed under the GPLv2. # -# This script builds a Plugbox distribution/image. +# This script builds an Arch Linux ARM distribution/image. # First, it downloads and installs packages to the workingdir, # then configures some basics, sets the root password to "root", # and then creates a rootts.tar.gz and/or a UBI image, ready to flash. @@ -14,13 +14,10 @@ # NOTE: This script is interactive. # Agree to installing packages and answer "y" to cleaning the Pacman database. # -# NOTE: Make sure the package "mtd-utils" is installed for making UBI images. -# # ==== Variables to set ==== INSTALLEDPKGS="base kernel26 kernel26-headers file heimdal ntfs-3g openssh openssl" -RELEASEVER=2011.02 +RELEASEVER=2011.06 MAKETARGZ=1 -MAKEUBIIMG=1 # ==== The Process ==== mkdir -p $1 echo -e "\033[1mInstalling packages...\033[0m" @@ -40,7 +37,7 @@ echo "de_DE ISO-8859-1" >> $1/etc/locale.gen echo "de_DE@euro ISO-8859-15" >> $1/etc/locale.gen chroot $1/ /usr/sbin/locale-gen chroot $1/ yes | /usr/bin/pacman -Scc -echo $RELEASEVER > $1/etc/plugapps-version +echo $RELEASEVER > $1/etc/alarm-version # Here is the rootfs.tar.gz part if you set MAKETARGZ to 1 if [ $MAKETARGZ = 1 ]; then @@ -52,25 +49,5 @@ else echo -e "\033[1mNot creating a rootfs.tar.gz...\033[0m" fi -# Here is the UBI image part if you set MAKEUBIIMG to 1 -if [ $MAKEUBIIMG = 1 ]; then - echo -e "\033[1mCreating a rootfs.ubi.img...\033[0m" - cat << EOF > ./ubi.cfg -[ubifs] -mode=ubi -image=rootfs.ubifs.img -vol_id=0 -vol_size=356MiB -vol_type=dynamic -vol_name=rootfs -vol_flags=autoresize -EOF - mkfs.ubifs -x zlib -m 2048 -e 129024 -c 4096 -r $1 rootfs.ubifs.img - ubinize -o rootfs.ubi.img -m 2048 -p 128KiB -s 512 ./ubi.cfg - rm -f ubi.cfg rootfs.ubifs.img -else - echo -e "\033[1mNot creating UBI image...\033[0m" -fi - echo -e "\033[1mCleaning up...\033[0m" rm -rf $1 diff --git a/scripts/recursive-builder b/scripts/recursive-builder deleted file mode 100755 index aa9e22153..000000000 --- a/scripts/recursive-builder +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# Plugbox Linux Repository Builder -# By IanJB and mikestaszel, with hopefully easy-to-read comments -# Licensed under the GPLv2 -# - -# ==== README ==== -# Put the name of the repository after the command, eg. -# ./recursive-builder extra -# -# For reference, $1 is the name of the repository you want built -# Packages built will be placed whereever you set makepkg.conf to put them. -# Make sure to set the settings below before running this script! - -# ==== SETTINGS ==== -# Set me to the root of your ABS repository, by default /var/abs -ABSDIR=/media/Plugbox/builder/abs - -# Set me to your PlugApps Github clone -GITDIR=/media/Plugbox/builder/plugapps - -# Set me to the directory you want to work in -WORKDIR=/media/Plugbox/builder/tmper - -# Set me to the makepkg command - The default below should work fine -MAKEPKGCMD="makepkg --ignorearch --asroot --clean --syncdeps --noconfirm --rmdeps" - -# ==== THE PROCESS ==== -# Sync ABS to get latest PKGBUILDs -abs - -mkdir -p $WORKDIR - -# Copy vanilla ABS PKGBUILDs first... -echo "Copying PKGBUILDs to the working directory..." -cp -r $ABSDIR/$1 $WORKDIR - -# Now overwrite them with modified Git PKGBUILDs (Testing) -cp -r $GITDIR/$1 $WORKDIR - -# Here's the actual building -cd $WORKDIR/$1 - -# In the workdir, go to the repository, find the names of folders, -# go into each folder, run makepkg, and go to the next folder... - -for i in `find . -maxdepth 1 -mindepth 1 -type d`; do - cd $i > /dev/null 2>&1 - $MAKEPKGCMD - cd ../$i > /dev/null 2>&1 -done - -echo "Deleting PKGBUILDs from the working directory..." -rm -rf $WORKDIR/$1 -echo "All done!"