initial attempt

.github/build-canary-i386

@@ -1 +0,0 @@
-1

.github/build-canary-v3

@@ -1 +0,0 @@
-1

.github/build-nest-i386

@@ -1 +0,0 @@
-1

.github/build-nest-v3

@@ -1 +0,0 @@
-1

.github/release-canary-i386

@@ -1 +0,0 @@
-1

.github/release-nest-i386

@@ -1 +0,0 @@
-1

.github/release-nest-v3

@@ -1 +0,0 @@
-1

.github/workflows/build-canaryi386.yml

@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (Canary) (i386)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-canary-i386'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh

.github/workflows/build-nesti386.yml

@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (i386)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-nest-i386'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nesti386
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh

.github/workflows/build-nestv3.yml

@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-nest-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh

.github/workflows/lto.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - main
     paths:
-      - '.github/release-canary-v3'
+      - 'pika-build-config/lto.sh'
 
 jobs:
   build:
@@ -31,7 +31,7 @@ jobs:
       run: apt-get update -y
 
     - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
+      run: cp -vf ./pika-build-config/ltosetup.sh ./pika-build-config.sh
 
     - name: Build Package
       run: ./main.sh

.github/workflows/release-canaryi386.yml

@@ -1,40 +0,0 @@
-name: PikaOS Package Build & Release (Canary) (i386)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/release-canary-i386'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh

.github/workflows/release-nesti386.yml

@@ -1,40 +0,0 @@
-name: PikaOS Package Build & Release (i386)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/release-nest-i386'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nesti386
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh

.github/workflows/release-nestv3.yml

@@ -1,40 +0,0 @@
-name: PikaOS Package Build & Release (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/release-nest-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh

.github/workflows/v3.yml

@@ -1,11 +1,11 @@
-name: PikaOS Package Build Only (Canary) (amd64-v3)
+name: PikaOS Package Build & Release (Canary) (amd64-v3)
 
 on:
   push:
     branches:
       - main
     paths:
-      - '.github/build-canary-v3'
+      - 'pika-build-config/v3.sh'
 
 jobs:
   build:
@@ -31,7 +31,10 @@ jobs:
       run: apt-get update -y
 
     - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
+      run: cp -vf ./pika-build-config/v3setup.sh ./pika-build-config.sh
 
     - name: Build Package
       run: ./main.sh
+
+    - name: Release Package
+      run: ./release.sh

debian/changelog

@@ -1,5 +0,0 @@
-upstream-name (1.0-101pika1) pika; urgency=medium
-
-  * Initial release. (Closes: #nnnn)  <nnnn is the bug number of your ITP>
-
- -- ferreo <harderthanfire@gmail.com>  Wed, 18 Jan 2023 21:48:14 +0000

debian/control

@@ -1,19 +0,0 @@
-Source: upstream-name
-Section: admin
-Priority: optional
-Maintainer: name <email>
-Standards-Version: 4.6.1
-Build-Depends: debhelper-compat (= 13)
-Rules-Requires-Root: no
-
-Package: pkgname1
-Architecture: linux-any
-# Delete any of these lines if un-used
-Depends: ${misc:Depends}, depends
-Recommends: high priority optdepends
-Conflicts: conflicts
-Suggests: low priority optdepends
-Breaks: also conflicts!?
-Provides: provides
-#
-Description: pkgdesc

debian/rules

@@ -1,67 +0,0 @@
-#! /usr/bin/make -f
-
-## See debhelper(7) (uncomment to enable).
-## Output every command that modifies files on the build system.
-export DH_VERBOSE = 1
-export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch)
-
-## === the chain of command ===
-## debuild runs a chain of dh functions in the following order:
-## dh_testdir
-## dh_clean
-## dh_auto_clean
-## dh_update_autotools_config
-## dh_autoreconf
-## dh_auto_configure
-## dh_prep
-## dh_build
-## dh_auto_build
-## dh_install
-## dh_auto_install
-## dh_installdocs
-## dh_installchangelogs
-## dh_perl
-## dh_link
-## dh_strip_nondeterminism
-## dh_compress
-## dh_fixperms
-## dh_missing
-## dh_dwz
-## dh_strip
-## dh_makeshlibs
-## dh_shlibdeps
-## dh_installdeb
-## dh_gencontrol
-## but you are most likely to only need to override the following:
-## dh_clean
-## dh_auto_configure
-## dh_build
-## dh_install
-
-## === End end of region ===
-
-## === overriding dh functions ===
-## by default all dh functions will run a specific command based on the build system selected by "dh $@"
-## if you have a makefile that does everything you need this is fine,
-## but most likely you have no MakeFile and you want to add your own commands
-## Note : overrides must be places above %:
-## So here's a few examples:
-
-## overriding dh_clean to make it not delete rust vendor files:
-#override_dh_clean:
-#	echo "disabled"
-
-## overriding dh_auto_configure to add custom configs:
-#override_dh_auto_configure:
-#		$(srcdir)/configure -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_DATADIR=/usr/share -DCMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu -DBUILD_PLUGIN=OFF
-
-## overriding dh_install to install files to a package:
-#override_dh_auto_configure:
-#		mkdir -p debian/pikman/usr/bin
-#		cp pikman debian/pikman/usr/bin/
-
-## === End end of region ===
-
-## This here will start the build:
-%:
-	dh $@

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

main.sh

@@ -6,15 +6,21 @@ set -e
 
 echo "$PIKA_BUILD_ARCH" > pika-build-arch
 
-VERSION="1.0"
+VERSION="$PIKA_PACKAGE_VERSION"
 
 # Clone Upstream
-mkdir -p ./src-pkg-name
-cp -rvf ./debian ./src-pkg-name/
-cd ./src-pkg-name/
+apt-get source "$PIKA_PACKAGE_NAME=$VERSION" -y
+
+if [ "$PIKA_REBUILD" = true ] ; then
+    VERSION="$VERSION+$PIKA_REBUILD_VERSION"
+fi
+
+#TODO - DO PATCHING
+#TODO - DO REVERSIONING FOR REBUILD
 
 # Get build deps
-LOGNAME=root dh_make --createorig -y -l -p src-pkg-name_"$VERSION" || echo "dh-make: Ignoring Last Error"
+#LOGNAME=root dh_make --createorig -y -l -p src-pkg-name_"$VERSION" || echo "dh-make: Ignoring Last Error"
+
 apt-get build-dep ./ -y
 
 # Build package

pika-build-config/i386.sh

@@ -1,5 +0,0 @@
-#! /bin/bash
-export PIKA_BUILD_ARCH="i386"
-export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_OPTIONS="nocheck notest terse"
-export DPKG_GENSYMBOLS_CHECK_LEVEL=0

pika-build-config/lto.sh

@@ -0,0 +1,5 @@
+export PIKA_PACKAGE_VERSION=""
+export PIKA_PACKAGE_NAME=""
+export PIKA_PACKAGE_PATCH=false
+export PIKA_REBUILD=false
+export PIKA_REBUILD_VERSION="b2"

pika-build-config/ltosetup.sh

@@ -1,4 +1,5 @@
 #! /bin/bash
+. ./lto.sh
 export PIKA_BUILD_ARCH="amd64-v3"
 export DEBIAN_FRONTEND="noninteractive"
 export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"

pika-build-config/v3.sh

@@ -0,0 +1,5 @@
+export PIKA_PACKAGE_VERSION=""
+export PIKA_PACKAGE_NAME=""
+export PIKA_PACKAGE_PATCH=false
+export PIKA_REBUILD=false
+export PIKA_REBUILD_VERSION="b2"

pika-build-config/v3setup.sh

@@ -0,0 +1,11 @@
+#! /bin/bash
+. ./nonelto.sh
+export PIKA_BUILD_ARCH="amd64-v3"
+export DEBIAN_FRONTEND="noninteractive"
+export DEB_BUILD_MAINT_OPTIONS="optimize=-march=x86-64-v3 -O3"
+export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
+export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
+export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
+export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
+export DEB_BUILD_OPTIONS="nocheck notest terse"
+export DPKG_GENSYMBOLS_CHECK_LEVEL=0

release.sh

@@ -1,3 +1,3 @@
 # send debs to server
-rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/
+rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/canary-incoming/